From feab25bfa191e0de69665672b985b6e57ac75703 Mon Sep 17 00:00:00 2001
From: "Tom Liu (Liu Hsiu-Chi)" <0xtomlord1122@gmail.com>
Date: Sun, 18 Oct 2026 22:41:00 +0800
Subject: [PATCH 1/3] fix(skills): clear the skills badge when opening skills

The sidebar dot stayed on after the user opened Skills because only an
opened live skill was marked seen, and the page defaults to drafts.
Opening Skills now clears the update badge. Parent write_skill also
publishes the same update event so a direct skill write lights the dot.

Signed-off-by: Tom Liu (Liu Hsiu-Chi) <0xtomlord1122@gmail.com>
---
 .../shell/app-shell-shortcuts.svelte.ts       |  2 +
 .../components/sidebar/SidebarFooter.svelte   |  5 ++-
 .../lib/stores/skill-updates.svelte.test.ts   |  5 +++
 cometmind/internal/tools/registry_add.go      |  2 +-
 .../internal/tools/skills/write_skill.go      | 19 +++++++-
 .../internal/tools/skills/write_skill_test.go | 43 +++++++++++++++++++
 6 files changed, 72 insertions(+), 4 deletions(-)
 create mode 100644 cometmind/internal/tools/skills/write_skill_test.go

diff --git a/cometline/src/lib/features/shell/app-shell-shortcuts.svelte.ts b/cometline/src/lib/features/shell/app-shell-shortcuts.svelte.ts
index 5c3f6075..95ffd9ef 100644
--- a/cometline/src/lib/features/shell/app-shell-shortcuts.svelte.ts
+++ b/cometline/src/lib/features/shell/app-shell-shortcuts.svelte.ts
@@ -11,6 +11,7 @@ import { openSettings } from '#lib/actions/open-settings.js';
 import { shouldUseWorkspacePanelHistory } from '#lib/features/shell/focus-nav.js';
 import { isReloadShortcut, matchesShortcut, type ShortcutAction } from '#lib/keyboard-shortcuts.js';
 import { inboxStore } from '#lib/stores/inbox.svelte.js';
+import { skillUpdatesStore } from '#lib/stores/skill-updates.svelte.js';
 import { sessionStore } from '#lib/stores/session.svelte.js';
 import { settingsStore } from '#lib/stores/settings.svelte.js';
 import { shellStore } from '#lib/stores/shell.svelte.js';
@@ -218,6 +219,7 @@ export function createAppShellShortcuts(deps: {
 			case 'openSkillDrafts':
 				if (shellStore.settingsOpen) shellStore.closeSettings();
 				inboxStore.closeDrawer();
+				skillUpdatesStore.markSeen();
 				void goto(resolve('skills'));
 				return;
 			case 'openGallery':
diff --git a/cometline/src/lib/features/sidebar/components/sidebar/SidebarFooter.svelte b/cometline/src/lib/features/sidebar/components/sidebar/SidebarFooter.svelte
index 29d119b8..1bc5623c 100644
--- a/cometline/src/lib/features/sidebar/components/sidebar/SidebarFooter.svelte
+++ b/cometline/src/lib/features/sidebar/components/sidebar/SidebarFooter.svelte
@@ -36,7 +36,10 @@
 			class="nav-badge"
 			class:has-badge={skillDraftsStore.hasDrafts || skillUpdatesStore.hasUnseen}
 			class:active={page.url.pathname === '/skills' || page.url.pathname === '/skill-drafts'}
-			onclick={() => goto(resolve('skills'))}
+			onclick={() => {
+				skillUpdatesStore.markSeen();
+				void goto(resolve('skills'));
+			}}
 			><Sparkles size={16} stroke-width={1.8} /></button
 		>
 	</Tooltip>
diff --git a/cometline/src/lib/stores/skill-updates.svelte.test.ts b/cometline/src/lib/stores/skill-updates.svelte.test.ts
index b53f7e0f..1fb98d67 100644
--- a/cometline/src/lib/stores/skill-updates.svelte.test.ts
+++ b/cometline/src/lib/stores/skill-updates.svelte.test.ts
@@ -22,5 +22,10 @@ describe('skillUpdatesStore', () => {
 
 		skillUpdatesStore.note(['ship-checklist']);
 		expect(skillUpdatesStore.hasUnseen).toBe(false);
+
+		skillUpdatesStore.note(['ship-checklist', 'retry-pattern']);
+		expect(skillUpdatesStore.unseen).toEqual(['retry-pattern']);
+		skillUpdatesStore.markSeen();
+		expect(skillUpdatesStore.hasUnseen).toBe(false);
 	});
 });
diff --git a/cometmind/internal/tools/registry_add.go b/cometmind/internal/tools/registry_add.go
index 9c6ac96d..93a18e31 100644
--- a/cometmind/internal/tools/registry_add.go
+++ b/cometmind/internal/tools/registry_add.go
@@ -53,7 +53,7 @@ func (r *Registry) addSkillTools(surface ToolSurface, opt RegistryOptions) {
 		r.Add(ReadSkillDraft{})
 	}
 	if surface.SkillMut {
-		r.Add(WriteSkill{})
+		r.Add(WriteSkill{Events: opt.MemoryEvents})
 		r.Add(PromoteSkillDraft{})
 	}
 }
diff --git a/cometmind/internal/tools/skills/write_skill.go b/cometmind/internal/tools/skills/write_skill.go
index b962b97d..7da33cd3 100644
--- a/cometmind/internal/tools/skills/write_skill.go
+++ b/cometmind/internal/tools/skills/write_skill.go
@@ -3,13 +3,17 @@ package skills
 import (
 	"context"
 	"encoding/json"
+	"strings"
 
+	"github.com/Cometline/cometline/cometmind/internal/event"
 	"github.com/Cometline/cometline/cometmind/internal/skills"
 	"github.com/Cometline/cometline/cometmind/internal/tools/toolkit"
 )
 
 // WriteSkill creates or updates an Agent Skill under ~/.cometmind/skills.
-type WriteSkill struct{}
+type WriteSkill struct {
+	Events *event.Hub
+}
 
 func (WriteSkill) Spec() ToolSpec {
 	return ToolSpec{
@@ -27,7 +31,7 @@ func (WriteSkill) Spec() ToolSpec {
 	}
 }
 
-func (WriteSkill) Execute(_ context.Context, input json.RawMessage) (Result, error) {
+func (t WriteSkill) Execute(ctx context.Context, input json.RawMessage) (Result, error) {
 	var in struct {
 		Name      *string `json:"name"`
 		Content   *string `json:"content"`
@@ -47,5 +51,16 @@ func (WriteSkill) Execute(_ context.Context, input json.RawMessage) (Result, err
 	if err := skills.WriteSkill(name, content, in.Overwrite); err != nil {
 		return Result{OK: false, Output: err.Error()}, nil
 	}
+	if t.Events != nil {
+		action := "created"
+		if in.Overwrite {
+			action = "updated"
+		}
+		t.Events.Publish(event.SkillReviewUpdated(toolkit.ToolSessionFrom(ctx), []event.SkillReviewChange{{
+			Name:        name,
+			Action:      action,
+			Description: strings.TrimSpace(skills.SkillMarkdownDescription(content)),
+		}}))
+	}
 	return Result{OK: true, Output: "skill " + name + " written to ~/.cometmind/skills/" + name + "/SKILL.md"}, nil
 }
diff --git a/cometmind/internal/tools/skills/write_skill_test.go b/cometmind/internal/tools/skills/write_skill_test.go
new file mode 100644
index 00000000..b59a5516
--- /dev/null
+++ b/cometmind/internal/tools/skills/write_skill_test.go
@@ -0,0 +1,43 @@
+package skills
+
+import (
+	"encoding/json"
+	"testing"
+	"time"
+
+	"github.com/Cometline/cometline/cometmind/internal/event"
+)
+
+func TestWriteSkillPublishesUpdate(t *testing.T) {
+	t.Setenv("HOME", t.TempDir())
+	hub := event.NewHub()
+	sub := hub.Subscribe()
+	defer sub.Close()
+
+	content := "---\nname: ship-checklist\ndescription: Ship a reviewed change\n---\n\n# Steps\n"
+	payload, err := json.Marshal(map[string]any{"name": "ship-checklist", "content": content})
+	if err != nil {
+		t.Fatal(err)
+	}
+	ctx := WithToolSession(t.Context(), "sess-1")
+	res, err := (WriteSkill{Events: hub}).Execute(ctx, payload)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !res.OK {
+		t.Fatalf("write failed: %s", res.Output)
+	}
+
+	select {
+	case ev := <-sub.Events:
+		if ev.Kind != event.KindSkillReviewUpdated || ev.SessionID != "sess-1" || len(ev.SkillReviews) != 1 {
+			t.Fatalf("event = %+v", ev)
+		}
+		got := ev.SkillReviews[0]
+		if got.Name != "ship-checklist" || got.Action != "created" || got.Description != "Ship a reviewed change" {
+			t.Fatalf("change = %+v", got)
+		}
+	case <-time.After(time.Second):
+		t.Fatal("missing skill update event")
+	}
+}

From f4aad4c1852915d9c2c80c5f6a712d2ab4a95057 Mon Sep 17 00:00:00 2001
From: "Tom Liu (Liu Hsiu-Chi)" <0xtomlord1122@gmail.com>
Date: Sun, 18 Oct 2026 22:41:03 +0800
Subject: [PATCH 2/3] feat(skills): show when self-improvement skills expire

Unpinned self-improvement skills archive 30 days after last use, then
delete 10 days after archive. The skills page now shows that countdown
on the list, preview, and archived rows.

Signed-off-by: Tom Liu (Liu Hsiu-Chi) <0xtomlord1122@gmail.com>
---
 .../skills-page/SkillsBrowseView.svelte       | 32 +++++++++++++++++--
 .../lib/features/skills/skill-expiry.test.ts  | 23 +++++++++++++
 .../src/lib/features/skills/skill-expiry.ts   | 15 +++++++++
 .../lib/generated/cometmind-api/types.gen.ts  |  4 +++
 cometmind/internal/apigen/types.gen.go        |  3 ++
 .../internal/server/skill_curator_handlers.go |  3 ++
 cometmind/internal/server/skill_handlers.go   |  8 ++++-
 cometmind/internal/skillcurator/service.go    | 29 +++++++++++++++--
 cometmind/internal/skills/curator.go          | 26 +++++++++++++++
 cometmind/internal/skills/curator_test.go     | 24 ++++++++++++++
 cometmind/openapi.yaml                        |  4 +++
 11 files changed, 166 insertions(+), 5 deletions(-)
 create mode 100644 cometline/src/lib/features/skills/skill-expiry.test.ts
 create mode 100644 cometline/src/lib/features/skills/skill-expiry.ts

diff --git a/cometline/src/lib/features/skills/components/skills-page/SkillsBrowseView.svelte b/cometline/src/lib/features/skills/components/skills-page/SkillsBrowseView.svelte
index 2f8525a1..7011879e 100644
--- a/cometline/src/lib/features/skills/components/skills-page/SkillsBrowseView.svelte
+++ b/cometline/src/lib/features/skills/components/skills-page/SkillsBrowseView.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import type { SkillsPageController } from '#lib/features/skills/skills-page-controller.svelte.js';
 	import type { SkillResource } from '#lib/types.js';
+	import { skillExpiryLabel } from '#lib/features/skills/skill-expiry.js';
 	import { skillUpdatesStore } from '#lib/stores/skill-updates.svelte.js';
 	import SkillsListPanel from './SkillsListPanel.svelte';
 	import SkillsListRow from './SkillsListRow.svelte';
@@ -14,9 +15,25 @@
 			: `${controller.filteredSkills.length} / ${controller.skills.length}`
 	);
 
+	function previewNotice(page: SkillsPageController): string {
+		const skill = page.selectedSkill?.skill;
+		if (!skill) return '';
+		if (!page.canEditSkill) return 'This bundled skill is read-only.';
+		if (skill.origin !== 'self-improvement') return '';
+		if (skill.pinned) return 'Pinned. This skill does not expire.';
+		return skillExpiryLabel(skill.expires_at, skill.status, Date.now(), skill.pinned);
+	}
+
 	function badgesFor(skill: SkillResource): string[] {
 		const badges: string[] = [];
 		if (skill.origin === 'self-improvement') badges.push('self-improvement');
+		const expiry = skillExpiryLabel(
+			skill.expires_at,
+			skill.status,
+			Date.now(),
+			skill.pinned
+		);
+		if (expiry) badges.push(expiry);
 		if (skill.status === 'stale') badges.push('stale');
 		if (skill.pinned) badges.push('pinned');
 		if (skill.is_symlink) badges.push('symlink');
@@ -81,7 +98,7 @@
 	emptyLabel="Select a skill to preview it."
 	item={controller.selectedSkill?.skill ?? null}
 	path={controller.selectedSkill?.skill.path}
-	notice={controller.canEditSkill ? '' : 'This bundled skill is read-only.'}
+	notice={previewNotice(controller)}
 	readonly={!controller.canEditSkill}
 	bind:value={controller.skillContent}
 >
@@ -129,8 +146,14 @@
 	<section class="archived-skills">
 		<h2>Archived</h2>
 		{#each controller.archived as skill (skill.name)}
+			{@const expiry = skillExpiryLabel(skill.expires_at, 'archived', Date.now(), skill.pinned)}
 			<div class="archived-row">
-				<span>{skill.name}</span>
+				<span>
+					{skill.name}
+					{#if expiry}
+						<span class="expiry">{expiry}</span>
+					{/if}
+				</span>
 				<button
 					type="button"
 					class="secondary"
@@ -149,6 +172,11 @@
 		margin-top: 12px;
 	}
 
+	.expiry {
+		margin-left: 8px;
+		color: var(--text-muted);
+	}
+
 	.archived-row {
 		display: flex;
 		align-items: center;
diff --git a/cometline/src/lib/features/skills/skill-expiry.test.ts b/cometline/src/lib/features/skills/skill-expiry.test.ts
new file mode 100644
index 00000000..249d7072
--- /dev/null
+++ b/cometline/src/lib/features/skills/skill-expiry.test.ts
@@ -0,0 +1,23 @@
+import { describe, expect, it } from 'vitest';
+import { skillExpiryLabel } from './skill-expiry';
+
+const now = Date.parse('2026-10-08T00:00:00Z');
+const day = 24 * 60 * 60 * 1000;
+
+describe('skillExpiryLabel', () => {
+	it('says when an active skill archives', () => {
+		expect(skillExpiryLabel(now + 20 * day, 'active', now)).toBe('archives in 20 days');
+		expect(skillExpiryLabel(now + day, 'stale', now)).toBe('archives in 1 day');
+	});
+
+	it('says when an archived skill deletes', () => {
+		expect(skillExpiryLabel(now + 7 * day, 'archived', now)).toBe('deletes in 7 days');
+		expect(skillExpiryLabel(now - day, 'archived', now)).toBe('deletes today');
+	});
+
+	it('is empty when the skill does not expire', () => {
+		expect(skillExpiryLabel(undefined, 'active', now)).toBe('');
+		expect(skillExpiryLabel(0, 'active', now)).toBe('');
+		expect(skillExpiryLabel(now + day, 'active', now, true)).toBe('');
+	});
+});
diff --git a/cometline/src/lib/features/skills/skill-expiry.ts b/cometline/src/lib/features/skills/skill-expiry.ts
new file mode 100644
index 00000000..4d8d8575
--- /dev/null
+++ b/cometline/src/lib/features/skills/skill-expiry.ts
@@ -0,0 +1,15 @@
+const dayMs = 24 * 60 * 60 * 1000;
+
+export function skillExpiryLabel(
+	expiresAt: number | undefined,
+	status: string | undefined,
+	now = Date.now(),
+	pinned = false
+): string {
+	if (!expiresAt || pinned) return '';
+	const days = Math.ceil((expiresAt - now) / dayMs);
+	const verb = status === 'archived' ? 'deletes' : 'archives';
+	if (days <= 0) return `${verb} today`;
+	if (days === 1) return `${verb} in 1 day`;
+	return `${verb} in ${days} days`;
+}
diff --git a/cometline/src/lib/generated/cometmind-api/types.gen.ts b/cometline/src/lib/generated/cometmind-api/types.gen.ts
index ce732e36..f6206ef1 100644
--- a/cometline/src/lib/generated/cometmind-api/types.gen.ts
+++ b/cometline/src/lib/generated/cometmind-api/types.gen.ts
@@ -581,6 +581,10 @@ export type Skill = {
      */
     status?: 'active' | 'stale' | 'archived';
     pinned?: boolean;
+    /**
+     * Unix milliseconds when an unpinned self-improvement skill is archived or an archived one is deleted. Omitted when pinned or not self-improvement.
+     */
+    expires_at?: number;
     /**
      * Optional tags from the skill frontmatter, used by the skills page filter.
      */
diff --git a/cometmind/internal/apigen/types.gen.go b/cometmind/internal/apigen/types.gen.go
index 588847a2..82a80ccc 100644
--- a/cometmind/internal/apigen/types.gen.go
+++ b/cometmind/internal/apigen/types.gen.go
@@ -2077,6 +2077,9 @@ type Skill struct {
 	IsSymlink   bool   `json:"is_symlink"`
 	Name        string `json:"name"`
 
+	// ExpiresAt Unix milliseconds when an unpinned self-improvement skill is archived or an archived one is deleted. Omitted when pinned or not self-improvement.
+	ExpiresAt *int64 `json:"expires_at,omitempty"`
+
 	// Origin metadata.cometline.origin. Empty means the skill was not created by the self-improvement loop.
 	Origin *string `json:"origin,omitempty"`
 	Path   string  `json:"path"`
diff --git a/cometmind/internal/server/skill_curator_handlers.go b/cometmind/internal/server/skill_curator_handlers.go
index a53e224b..0c44d789 100644
--- a/cometmind/internal/server/skill_curator_handlers.go
+++ b/cometmind/internal/server/skill_curator_handlers.go
@@ -25,6 +25,9 @@ func (a *App) handleListArchivedSkills(c *gin.Context) {
 		}
 		resource := a.skillResourceFromModel(skill)
 		resource.Status = skillpkg.CuratorStatusArchived
+		if life := a.curator.Lifecycle(c.Request.Context(), name); !life.ExpiresAt.IsZero() {
+			resource.ExpiresAt = life.ExpiresAt.UnixMilli()
+		}
 		items = append(items, resource)
 	}
 	c.JSON(http.StatusOK, gin.H{"skills": items})
diff --git a/cometmind/internal/server/skill_handlers.go b/cometmind/internal/server/skill_handlers.go
index 48ee573e..e727c9d3 100644
--- a/cometmind/internal/server/skill_handlers.go
+++ b/cometmind/internal/server/skill_handlers.go
@@ -26,6 +26,7 @@ type skillResource struct {
 	Origin      string   `json:"origin,omitempty"`
 	Status      string   `json:"status,omitempty"`
 	Pinned      bool     `json:"pinned,omitempty"`
+	ExpiresAt   int64    `json:"expires_at,omitempty"`
 	Tags        []string `json:"tags,omitempty"`
 }
 
@@ -199,7 +200,12 @@ func (a *App) skillResourceFromModel(skill skillpkg.Skill) skillResource {
 		Tags:        skill.Tags,
 	}
 	if a != nil && a.curator != nil && skillpkg.IsSelfImprovement(skill) {
-		resource.Status, resource.Pinned = a.curator.Lookup(context.Background(), skill.Name)
+		life := a.curator.Lifecycle(context.Background(), skill.Name)
+		resource.Status = life.Status
+		resource.Pinned = life.Pinned
+		if !life.ExpiresAt.IsZero() {
+			resource.ExpiresAt = life.ExpiresAt.UnixMilli()
+		}
 	}
 	return resource
 }
diff --git a/cometmind/internal/skillcurator/service.go b/cometmind/internal/skillcurator/service.go
index fb26fd78..7c0dbec4 100644
--- a/cometmind/internal/skillcurator/service.go
+++ b/cometmind/internal/skillcurator/service.go
@@ -250,13 +250,38 @@ func (s *Service) MarkArchived(ctx context.Context, name string) error {
 	return s.save(ctx, row)
 }
 
+// Lifecycle is the curator clock the skills page can show.
+type Lifecycle struct {
+	Status    string
+	Pinned    bool
+	ExpiresAt time.Time
+}
+
 // Lookup returns status and pinned for a skill name.
 func (s *Service) Lookup(ctx context.Context, name string) (status string, pinned bool) {
+	life := s.Lifecycle(ctx, name)
+	return life.Status, life.Pinned
+}
+
+// Lifecycle returns status, pin, and the next archive or delete time.
+func (s *Service) Lifecycle(ctx context.Context, name string) Lifecycle {
 	row, err := s.q.GetSkillCuratorState(ctx, name)
 	if err != nil {
-		return "", false
+		return Lifecycle{}
+	}
+	skill := skills.CuratorSkill{
+		Name:       row.SkillName,
+		Status:     row.Status,
+		Pinned:     row.Pinned != 0,
+		CreatedAt:  unixMilli(row.CreatedAt),
+		LastUsedAt: unixMilli(row.LastUsedAt),
+		ArchivedAt: unixMilli(row.ArchivedAt),
+	}
+	return Lifecycle{
+		Status:    row.Status,
+		Pinned:    skill.Pinned,
+		ExpiresAt: skills.ExpiresAt(s.now(), skill),
 	}
-	return row.Status, row.Pinned != 0
 }
 
 // ArchivedNames lists archived curator rows.
diff --git a/cometmind/internal/skills/curator.go b/cometmind/internal/skills/curator.go
index eb0804c1..c3baacdc 100644
--- a/cometmind/internal/skills/curator.go
+++ b/cometmind/internal/skills/curator.go
@@ -60,6 +60,32 @@ func PlanCuratorTransitions(now time.Time, skills []CuratorSkill) []CuratorActio
 	return actions
 }
 
+// ExpiresAt is when an unpinned skill is archived, or an archived skill is deleted.
+// Pinned skills and rows with no clock do not expire.
+func ExpiresAt(now time.Time, skill CuratorSkill) time.Time {
+	if skill.Pinned {
+		return time.Time{}
+	}
+	status := skill.Status
+	if status == "" {
+		status = CuratorStatusActive
+	}
+	if status == CuratorStatusArchived {
+		if skill.ArchivedAt.IsZero() {
+			return time.Time{}
+		}
+		return skill.ArchivedAt.Add(CuratorDeleteAfter)
+	}
+	base := skill.LastUsedAt
+	if base.IsZero() {
+		base = skill.CreatedAt
+	}
+	if base.IsZero() {
+		return time.Time{}
+	}
+	return base.Add(CuratorArchiveAfter)
+}
+
 func unusedFor(now time.Time, skill CuratorSkill) time.Duration {
 	base := skill.LastUsedAt
 	if base.IsZero() {
diff --git a/cometmind/internal/skills/curator_test.go b/cometmind/internal/skills/curator_test.go
index 91689b55..72ed7d6f 100644
--- a/cometmind/internal/skills/curator_test.go
+++ b/cometmind/internal/skills/curator_test.go
@@ -41,6 +41,30 @@ func TestPlanCuratorTransitions(t *testing.T) {
 	}
 }
 
+func TestExpiresAt(t *testing.T) {
+	now := time.Date(2026, 10, 8, 0, 0, 0, 0, time.UTC)
+	created := now.Add(-10 * 24 * time.Hour)
+	used := now.Add(-2 * 24 * time.Hour)
+	archived := now.Add(-3 * 24 * time.Hour)
+	tests := []struct {
+		name string
+		in   CuratorSkill
+		want time.Time
+	}{
+		{name: "archive clock", in: CuratorSkill{Status: CuratorStatusActive, CreatedAt: created}, want: created.Add(CuratorArchiveAfter)},
+		{name: "use resets archive clock", in: CuratorSkill{Status: CuratorStatusStale, CreatedAt: created, LastUsedAt: used}, want: used.Add(CuratorArchiveAfter)},
+		{name: "pinned does not expire", in: CuratorSkill{Status: CuratorStatusActive, Pinned: true, CreatedAt: created}},
+		{name: "archived deletes later", in: CuratorSkill{Status: CuratorStatusArchived, CreatedAt: created, ArchivedAt: archived}, want: archived.Add(CuratorDeleteAfter)},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := ExpiresAt(now, tt.in); !got.Equal(tt.want) {
+				t.Fatalf("expires = %s, want %s", got, tt.want)
+			}
+		})
+	}
+}
+
 func TestCuratorPassDue(t *testing.T) {
 	now := time.Date(2026, 10, 8, 0, 0, 0, 0, time.UTC)
 	run, first, note := CuratorPassDue(now, time.Time{}, time.Time{}, false, true)
diff --git a/cometmind/openapi.yaml b/cometmind/openapi.yaml
index ca0c0190..c0760fe9 100644
--- a/cometmind/openapi.yaml
+++ b/cometmind/openapi.yaml
@@ -3639,6 +3639,10 @@ components:
           enum: [active, stale, archived]
         pinned:
           type: boolean
+        expires_at:
+          type: integer
+          format: int64
+          description: Unix milliseconds when an unpinned self-improvement skill is archived or an archived one is deleted. Omitted when pinned or not self-improvement.
         tags:
           type: array
           description: Optional tags from the skill frontmatter, used by the skills page filter.

From 8c3717db09c5a83819793c9e1f9c51521cb8a768 Mon Sep 17 00:00:00 2001
From: "Tom Liu (Liu Hsiu-Chi)" <0xtomlord1122@gmail.com>
Date: Sun, 18 Oct 2026 22:43:49 +0800
Subject: [PATCH 3/3] chore(skills): regenerate API types and format expiry
 view

Signed-off-by: Tom Liu (Liu Hsiu-Chi) <0xtomlord1122@gmail.com>
---
 .../components/skills-page/SkillsBrowseView.svelte | 14 +++++++-------
 cometmind/internal/apigen/types.gen.go             |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cometline/src/lib/features/skills/components/skills-page/SkillsBrowseView.svelte b/cometline/src/lib/features/skills/components/skills-page/SkillsBrowseView.svelte
index 7011879e..3f591a45 100644
--- a/cometline/src/lib/features/skills/components/skills-page/SkillsBrowseView.svelte
+++ b/cometline/src/lib/features/skills/components/skills-page/SkillsBrowseView.svelte
@@ -27,12 +27,7 @@
 	function badgesFor(skill: SkillResource): string[] {
 		const badges: string[] = [];
 		if (skill.origin === 'self-improvement') badges.push('self-improvement');
-		const expiry = skillExpiryLabel(
-			skill.expires_at,
-			skill.status,
-			Date.now(),
-			skill.pinned
-		);
+		const expiry = skillExpiryLabel(skill.expires_at, skill.status, Date.now(), skill.pinned);
 		if (expiry) badges.push(expiry);
 		if (skill.status === 'stale') badges.push('stale');
 		if (skill.pinned) badges.push('pinned');
@@ -146,7 +141,12 @@
 	<section class="archived-skills">
 		<h2>Archived</h2>
 		{#each controller.archived as skill (skill.name)}
-			{@const expiry = skillExpiryLabel(skill.expires_at, 'archived', Date.now(), skill.pinned)}
+			{@const expiry = skillExpiryLabel(
+				skill.expires_at,
+				'archived',
+				Date.now(),
+				skill.pinned
+			)}
 			<div class="archived-row">
 				<span>
 					{skill.name}
diff --git a/cometmind/internal/apigen/types.gen.go b/cometmind/internal/apigen/types.gen.go
index 82a80ccc..ae5f1fbb 100644
--- a/cometmind/internal/apigen/types.gen.go
+++ b/cometmind/internal/apigen/types.gen.go
@@ -2073,12 +2073,12 @@ type Skill struct {
 	CanEdit     bool   `json:"can_edit"`
 	CanExport   bool   `json:"can_export"`
 	Description string `json:"description"`
-	Internal    bool   `json:"internal"`
-	IsSymlink   bool   `json:"is_symlink"`
-	Name        string `json:"name"`
 
 	// ExpiresAt Unix milliseconds when an unpinned self-improvement skill is archived or an archived one is deleted. Omitted when pinned or not self-improvement.
 	ExpiresAt *int64 `json:"expires_at,omitempty"`
+	Internal  bool   `json:"internal"`
+	IsSymlink bool   `json:"is_symlink"`
+	Name      string `json:"name"`
 
 	// Origin metadata.cometline.origin. Empty means the skill was not created by the self-improvement loop.
 	Origin *string `json:"origin,omitempty"`