Accept adjacent sidechain lifecycle aliases

Author: SqlRush

docs/cc-100-roadmap.md

@@ -32,6 +32,8 @@
 | M7 初始 TUI 层 | 已完成轻量 terminal frame renderer、PromptInput 状态机、history 导航、ctrl-p/ctrl-n history navigation、shift-enter 多行输入、多行 prompt 行内 ctrl-a/ctrl-e/ctrl-u/ctrl-k 和 wrap/render/cursor、共享 kill ring、ctrl-b/ctrl-f/ctrl-u/ctrl-k/ctrl-w 行编辑、alt-b/alt-f/alt-d/alt-backspace word 编辑、ctrl-left/ctrl-right/alt-left/alt-right word motion、ctrl-y yank 和 alt-y yank-pop 初版、reverse-search cursor/word 编辑/kill/yank/yank-pop 初版、ctrl-c interrupt/双击退出事件、ctrl-d delete-forward/空输入双击退出事件、ctrl-l 重绘事件、ctrl-o/ctrl-t 全局切换事件、ctrl-g/ctrl-s/ctrl-x chord chat 事件、reverse-search 状态/渲染/脚本断言/空结果/选择回填/cursor 断言、paste/image hint 输入和 OSC ST/base64 filename 兼容、text/image pasted-content 引用/metadata 脚本断言/提交展开/history entry restoration、SGR mouse 解析、alternate terminal navigation key sequences including modified Home/End/Delete/PageUp/PageDown、滚轮滚动、修饰键滚轮/左键、左键拖动选择、viewport 半页/顶部/底部可配置滚动、viewport 点击选择和 dialog action 点击、focus/blur 事件、resize 视口保持、keybinding resolver/config/chord pending/null-unbind/key/action camelCase alias、JSON config loader 和 focus/mouse/paste/image key name 覆盖、vim insert/normal/j/k/word/WORD/ge/gE/line-local ^/$/0/|/I/A/D/quote/bracket text-object/yank/register/paste/delete/count/replace/undo/find/till/repeat/matching-pair %/dot-repeat/G/gg/toggle/join/open-line/indent/substitute 动作、normal-mode arrow/backspace/delete 映射和 operator linewise/字符范围、REPL screen、permission/task dialog builder、dialog kind/id routing/runtime/status line、runtime 到 REPL screen 的 dialog/status 同步、runtime-aware interaction script runner、prompt text/cursor/expanded/vim mode/register/task state/dialog result/runtime mutation/task bulk-cancel/permission cancel/keybinding mutation/status negative/snapshot negative/screen size/event-sequence/event-count/no-event/dialog-result-count/no-dialog-result 脚本断言、viewport 脚本断言、named-key 脚本输入、script JSON/JSONL/wrapper loader、script file runner 和 runtime/task camel field aliases、stale dialog race guard、cancel active、permission id/all cancellation、queued permission promotion、active task dialog refresh、task lifecycle/bulk-cancel 初版、idempotent alternate screen lifecycle/reset/reassert interactive 初版、mouse/focus/bracketed-paste terminal mode lifecycle/reconciliation、ANSI snapshot 基础、snapshot corpus write/compare/script-file compare/missing-baseline/diff/batch/strict unexpected-baseline 状态、scripted interaction runner/assertions/multi-key/text/paste/image/pasted-content metadata 初版、status/dialog/message components、viewport/selection |
 | 全量测试 | 当前 `go test ./...` 通过 |
 
+M6 补充：sidechain/subagent lifecycle state loader 现在接受 `subagent_started`、`agentStarted`、`task_failed`、`sidechainCompleted` 等相邻 subtype aliases，支持 `taskID`/`workerId`/`runId`、`agentName`/`kind`、`resultText`/`finalMessage` 等字段，并在 failed/cancelled subtype 没有显式 status 时自动归一状态。
+
 M6 补充：transcript resume 的嵌套 content block 现在接受 `toolUseId`/`toolUseID`、`isError`、`cacheControl`、`cacheReference` 字段别名，并保留 cache edit 的 `cacheReference`。
 
 M6 补充：transcript resume 的 nested content block `id`/`tool_use_id`/`toolUseId` 现在接受 JSON number，并保留为字符串 tool-use ID。

docs/claude-code-go-rewrite-plan.md

@@ -185,6 +185,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：sidechain agent metadata sidecar 读取接受 `type`/`subagentType`/`agentName`/`name`、`workspacePath`/`workspace`/`path`/`directory`、`taskDescription`/`prompt`/`input`/`command`/`title` 等字段别名，避免历史或第三方 subagent sidecar 在 resume/list 时丢失 agent 类型、worktree 路径或任务描述。
 - 本轮补充：sidechain/subagent lifecycle content 读取会递归解包 `payload`/`data`/`body`/`result`/`response`/`metadata` 等 wrapper，嵌套的 subagent ID、status/outcome、summary、agent type、workspace path 和 task description 都可参与 state/list/resume 恢复。
 - 本轮补充：sidechain/subagent lifecycle 的 ID 等 string-like 字段接受 JSON number 和 Go 数字标量，numeric subagent ID 会保留为字符串并可用于 state/list/resume 查找。
+- 本轮补充：sidechain/subagent lifecycle subtype 现在接受 `subagent_started`、`agentStarted`、`task_failed`、`sidechainCompleted` 等相邻事件名，并从 `taskID`/`workerId`/`runId`、`agentName`/`kind`、`resultText`/`finalMessage` 等字段恢复 state/list/resume 信息；`*_failed`/`*_cancelled` subtype 无显式 status 时会归一到 failed/cancelled。
 - 本轮补充：transcript metadata loader 为 file-history snapshot 和 attribution snapshot 建立 `messageId` 索引，并接受 `message_id`/`messageUuid`/`id` 等字段别名，保留 raw list 的同时支持按消息恢复 snapshot。
 - 本轮补充：transcript message/index/session list 读取 `gitBranch`，兼容 `git_branch`/`branch` 别名，并让 session search 可以按分支名命中，贴近官方 lite metadata 的 branch 展示和检索行为。
 - 本轮补充：full transcript `TitleFromTranscript` 的标题优先级和 indexed/lite 路径对齐，按 custom title、AI title、首个用户 prompt、last-prompt、summary 顺序兜底。

docs/first-second-parity-audit.md

@@ -174,6 +174,7 @@ M6 progress now includes:
 - `internal/session`: sidechain lifecycle scalar fields now accept JSON number values for IDs and other string-like fields, preserving numeric subagent IDs as strings across state/list/resume recovery.
 - `internal/session`: sidechain runtime finish now canonicalizes status aliases such as `success`, `error`, and `canceled` before writing summary records, keeping sidechain and main transcript lifecycle output stable.
 - `internal/session`: sidechain runtime now rejects duplicate starts while the same sidechain ID is running, and state loading treats a later start as a fresh lifecycle by clearing stale summary/end metadata.
+- `internal/session`: sidechain lifecycle state loading now accepts adjacent subtype aliases such as `subagent_started`, `agentStarted`, `task_failed`, and `sidechainCompleted`, with broader task/worker/run ID fields plus `resultText`/`finalMessage` summaries and subtype-derived failed/cancelled defaults.
 - `internal/session`: transcript metadata loading now indexes file-history and attribution snapshots by message ID, with aliases such as `message_id`, `messageUuid`, and `id`, while preserving raw snapshot lists.
 - `internal/session`: transcript indexes and session search now recover message `gitBranch` values, accept `git_branch`/`branch` aliases, and can match sessions by branch name.
 - `internal/session`: full transcript title derivation now matches indexed/lite fallback order: custom title, AI title, first user prompt, last-prompt metadata, then summary.

internal/session/sidechain_status.go

@@ -7,6 +7,7 @@ import (
 	"sort"
 	"strconv"
 	"strings"
+	"unicode"
 
 	"ccgo/internal/contracts"
 )
@@ -28,6 +29,57 @@ type SidechainState struct {
 	Metadata     SidechainMetadata
 }
 
+var sidechainLifecycleIDFields = []string{
+	"sidechainId", "sidechainID", "sidechain_id",
+	"subagentId", "subagentID", "subagent_id",
+	"agentId", "agentID", "agent_id",
+	"taskId", "taskID", "task_id",
+	"workerId", "workerID", "worker_id",
+	"runId", "runID", "run_id",
+	"id",
+}
+
+var sidechainLifecycleAgentTypeFields = []string{
+	"agentType", "agent_type",
+	"subagentType", "subagent_type",
+	"agentKind", "agent_kind",
+	"agentName", "agent_name",
+	"kind", "name", "agent",
+}
+
+var sidechainLifecycleWorktreeFields = []string{
+	"worktreePath", "worktree_path",
+	"worktree", "worktreeDir", "worktree_dir",
+	"workingDirectory", "working_directory",
+	"cwd",
+	"workspacePath", "workspace_path", "workspace",
+	"path", "directory",
+}
+
+var sidechainLifecycleDescriptionFields = []string{
+	"description", "description_text", "descriptionText",
+	"desc", "summary",
+	"task", "taskDescription", "task_description",
+	"prompt", "input", "command", "title",
+}
+
+var sidechainLifecycleStartStatusFields = []string{
+	"status", "state", "phase", "lifecycle", "lifecycle_state", "lifecycleState",
+}
+
+var sidechainLifecycleSummaryStatusFields = []string{
+	"status", "state", "result", "outcome", "phase", "lifecycle", "lifecycle_state", "lifecycleState",
+}
+
+var sidechainLifecycleSummaryFields = []string{
+	"summary", "summary_text", "summaryText",
+	"finalSummary", "final_summary",
+	"resultSummary", "result_summary",
+	"resultText", "result_text",
+	"finalMessage", "final_message",
+	"message", "text", "output", "value", "final",
+}
+
 func LoadSidechainState(info SidechainInfo) (SidechainState, error) {
 	transcript, err := LoadTranscript(info.Path)
 	if err != nil {
@@ -74,19 +126,19 @@ func LoadSidechainState(info SidechainInfo) (SidechainState, error) {
 			state.StartedAt = msg.Timestamp
 			state.EndedAt = ""
 			state.Summary = ""
-			if sidechainID := firstStringField(msg.Content, "sidechainId", "sidechainID", "sidechain_id", "subagentId", "subagentID", "subagent_id", "agentId", "agentID", "agent_id", "id"); sidechainID != "" {
+			if sidechainID := firstStringField(msg.Content, sidechainLifecycleIDFields...); sidechainID != "" {
 				state.ID = sidechainID
 			}
-			if agentType := firstStringField(msg.Content, "agentType", "agent_type", "subagentType", "subagent_type", "agentKind", "agent_kind", "agent"); agentType != "" && state.Metadata.AgentType == "" {
+			if agentType := firstStringField(msg.Content, sidechainLifecycleAgentTypeFields...); agentType != "" && state.Metadata.AgentType == "" {
 				state.Metadata.AgentType = agentType
 			}
-			if worktreePath := firstStringField(msg.Content, "worktreePath", "worktree_path", "worktree", "worktreeDir", "worktree_dir", "workingDirectory", "working_directory", "cwd", "workspacePath", "workspace_path", "workspace", "path", "directory"); worktreePath != "" && state.Metadata.WorktreePath == "" {
+			if worktreePath := firstStringField(msg.Content, sidechainLifecycleWorktreeFields...); worktreePath != "" && state.Metadata.WorktreePath == "" {
 				state.Metadata.WorktreePath = worktreePath
 			}
-			if description := firstStringField(msg.Content, "description", "description_text", "descriptionText", "desc", "summary", "task", "taskDescription", "task_description", "prompt", "input", "command", "title"); description != "" && state.Metadata.Description == "" {
+			if description := firstStringField(msg.Content, sidechainLifecycleDescriptionFields...); description != "" && state.Metadata.Description == "" {
 				state.Metadata.Description = description
 			}
-			if status := sidechainStatusField(msg.Content, "status", "state", "phase", "lifecycle", "lifecycle_state", "lifecycleState"); status != "" {
+			if status := sidechainStatusField(msg.Content, sidechainLifecycleStartStatusFields...); status != "" {
 				state.Status = status
 			} else {
 				state.Status = SidechainStatusRunning
@@ -95,15 +147,17 @@ func LoadSidechainState(info SidechainInfo) (SidechainState, error) {
 		if isSidechainSummarySubtype(msg.Subtype) {
 			finished = true
 			state.EndedAt = msg.Timestamp
-			if sidechainID := firstStringField(msg.Content, "sidechainId", "sidechainID", "sidechain_id", "subagentId", "subagentID", "subagent_id", "agentId", "agentID", "agent_id", "id"); sidechainID != "" {
+			if sidechainID := firstStringField(msg.Content, sidechainLifecycleIDFields...); sidechainID != "" {
 				state.ID = sidechainID
 			}
-			if status := sidechainStatusField(msg.Content, "status", "state", "result", "outcome", "phase", "lifecycle", "lifecycle_state", "lifecycleState"); status != "" {
+			if status := sidechainStatusField(msg.Content, sidechainLifecycleSummaryStatusFields...); status != "" {
+				state.Status = status
+			} else if status := defaultSidechainSummaryStatus(msg.Subtype); status != "" {
 				state.Status = status
 			} else {
 				state.Status = SidechainStatusCompleted
 			}
-			state.Summary = firstStringField(msg.Content, "summary", "summary_text", "summaryText", "finalSummary", "final_summary", "resultSummary", "result_summary", "message", "text")
+			state.Summary = firstStringField(msg.Content, sidechainLifecycleSummaryFields...)
 		}
 	}
 	if state.Status == SidechainStatusUnknown {
@@ -121,23 +175,64 @@ func LoadSidechainState(info SidechainInfo) (SidechainState, error) {
 }
 
 func isSidechainStartSubtype(subtype string) bool {
-	switch strings.TrimSpace(subtype) {
-	case "sidechain_start", "sidechainStart", "subagent_start", "subagentStart", "agent_start", "agentStart", "task_start", "taskStart":
+	switch sidechainSubtypeAction(subtype) {
+	case "start", "started":
 		return true
 	default:
 		return false
 	}
 }
 
 func isSidechainSummarySubtype(subtype string) bool {
-	switch strings.TrimSpace(subtype) {
-	case "sidechain_summary", "sidechainSummary", "sidechain_end", "sidechainEnd", "sidechain_finish", "sidechainFinish", "subagent_summary", "subagentSummary", "subagent_end", "subagentEnd", "subagent_finish", "subagentFinish", "agent_summary", "agentSummary", "agent_end", "agentEnd", "agent_finish", "agentFinish", "task_summary", "taskSummary", "task_end", "taskEnd", "task_finish", "taskFinish":
+	switch sidechainSubtypeAction(subtype) {
+	case "summary", "summarized", "summarised",
+		"end", "ended",
+		"finish", "finished",
+		"complete", "completed",
+		"success", "succeeded", "done",
+		"fail", "failed", "failure",
+		"error", "errored",
+		"cancel", "cancelled", "canceled",
+		"abort", "aborted":
 		return true
 	default:
 		return false
 	}
 }
 
+func defaultSidechainSummaryStatus(subtype string) string {
+	switch sidechainSubtypeAction(subtype) {
+	case "complete", "completed", "success", "succeeded", "done":
+		return SidechainStatusCompleted
+	case "fail", "failed", "failure", "error", "errored":
+		return SidechainStatusFailed
+	case "cancel", "cancelled", "canceled", "abort", "aborted":
+		return SidechainStatusCancelled
+	default:
+		return ""
+	}
+}
+
+func sidechainSubtypeAction(subtype string) string {
+	normalized := normalizeSidechainSubtype(subtype)
+	for _, prefix := range []string{"sidechain", "subagent", "agent", "task"} {
+		if strings.HasPrefix(normalized, prefix) {
+			return strings.TrimPrefix(normalized, prefix)
+		}
+	}
+	return ""
+}
+
+func normalizeSidechainSubtype(subtype string) string {
+	var builder strings.Builder
+	for _, r := range strings.TrimSpace(subtype) {
+		if unicode.IsLetter(r) || unicode.IsDigit(r) {
+			builder.WriteRune(unicode.ToLower(r))
+		}
+	}
+	return builder.String()
+}
+
 func sidechainStatusField(value any, keys ...string) string {
 	return normalizeSidechainStatus(firstStringField(value, keys...))
 }

internal/session/sidechain_test.go

@@ -221,6 +221,89 @@ func TestLoadSidechainStateAcceptsSubtypeAndStatusAliases(t *testing.T) {
 	}
 }
 
+func TestLoadSidechainStateAcceptsAdjacentLifecycleSubtypeAliases(t *testing.T) {
+	sessionPath := filepath.Join(t.TempDir(), "session.jsonl")
+	sessionID := contracts.ID("sess_1")
+	if err := AppendSidechainMessage(sessionPath, sessionID, "worker-failed", TranscriptMessage{
+		Type:      "system",
+		UUID:      "failed_start",
+		Timestamp: "2026-01-01T00:00:01Z",
+		Subtype:   "subagent_started",
+		Content: map[string]any{
+			"taskID":    "worker_9",
+			"agentName": "researcher",
+			"workspace": "/tmp/research-worktree",
+			"task":      "trace lifecycle",
+		},
+	}); err != nil {
+		t.Fatal(err)
+	}
+	if err := AppendSidechainMessage(sessionPath, sessionID, "worker-failed", TranscriptMessage{
+		Type:      "system",
+		UUID:      "failed_summary",
+		Timestamp: "2026-01-01T00:00:02Z",
+		Subtype:   "task_failed",
+		Content: map[string]any{
+			"workerId":   "worker_9",
+			"resultText": "agent crashed",
+		},
+	}); err != nil {
+		t.Fatal(err)
+	}
+	if err := AppendSidechainMessage(sessionPath, sessionID, "worker-completed", TranscriptMessage{
+		Type:      "system",
+		UUID:      "completed_start",
+		Timestamp: "2026-01-01T00:00:03Z",
+		Subtype:   "agentStarted",
+		Content: map[string]any{
+			"runID": "worker_10",
+			"kind":  "reviewer",
+			"cwd":   "/tmp/review-worktree",
+			"input": "review the diff",
+		},
+	}); err != nil {
+		t.Fatal(err)
+	}
+	if err := AppendSidechainMessage(sessionPath, sessionID, "worker-completed", TranscriptMessage{
+		Type:      "system",
+		UUID:      "completed_summary",
+		Timestamp: "2026-01-01T00:00:04Z",
+		Subtype:   "sidechainCompleted",
+		Content: map[string]any{
+			"runId":        "worker_10",
+			"finalMessage": "review complete",
+		},
+	}); err != nil {
+		t.Fatal(err)
+	}
+
+	states, err := ListSidechainStates(sessionPath, sessionID)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(states) != 2 {
+		t.Fatalf("states = %#v", states)
+	}
+	byID := map[string]SidechainState{}
+	for _, state := range states {
+		byID[state.ID] = state
+	}
+	failed := byID["worker_9"]
+	completed := byID["worker_10"]
+	if failed.ID != "worker_9" || failed.Status != SidechainStatusFailed || failed.Summary != "agent crashed" {
+		t.Fatalf("failed state = %#v", failed)
+	}
+	if failed.Metadata.AgentType != "researcher" || failed.Metadata.WorktreePath != "/tmp/research-worktree" || failed.Metadata.Description != "trace lifecycle" {
+		t.Fatalf("failed metadata = %#v", failed.Metadata)
+	}
+	if completed.ID != "worker_10" || completed.Status != SidechainStatusCompleted || completed.Summary != "review complete" {
+		t.Fatalf("completed state = %#v", completed)
+	}
+	if completed.Metadata.AgentType != "reviewer" || completed.Metadata.WorktreePath != "/tmp/review-worktree" || completed.Metadata.Description != "review the diff" {
+		t.Fatalf("completed metadata = %#v", completed.Metadata)
+	}
+}
+
 func TestLoadSidechainStateAcceptsWrappedLifecycleContent(t *testing.T) {
 	sessionPath := filepath.Join(t.TempDir(), "session.jsonl")
 	sessionID := contracts.ID("sess_1")