Accept compact sidechain lifecycle statuses

Author: SqlRush

docs/cc-100-roadmap.md

@@ -44,6 +44,8 @@ M6 补充：sidechain/subagent lifecycle state loader 现在接受 `subagent_sta
 
 M6 补充：sidechain/subagent lifecycle content 读取现在接受 JSON:API/resource-style `resource`/`attributes`/`properties` wrapper，外层 resource `id` 可作为 sidechain ID fallback，内层 agent metadata、status/outcome 和 summary 字段仍能恢复到 state/list/resume。
 
+M6 补充：sidechain/subagent lifecycle status 归一化现在接受 compact/camel aliases，包括 `inProgress`、`completedSuccessfully`、`cancelledByUser`/`canceledByUser`、`failedError`/`failedWithError` 和 `timedOut`，并保持 transcript/runtime 输出为 canonical running/completed/cancelled/failed。
+
 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

@@ -187,6 +187,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：sidechain/subagent lifecycle content 读取现在也接受 JSON:API/resource-style 的 `resource`/`attributes`/`properties` wrapper；外层 resource `id` 可作为 sidechain ID fallback，内层 metadata、status/outcome 和 summary 仍会参与 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。
+- 本轮补充：sidechain/subagent lifecycle status 归一化现在接受 compact/camel aliases，包括 `inProgress`、`completedSuccessfully`、`cancelledByUser`/`canceledByUser`、`failedError`/`failedWithError` 和 `timedOut`，并继续写回 canonical running/completed/cancelled/failed 状态。
 - 本轮补充：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

@@ -179,6 +179,7 @@ M6 progress now includes:
 - `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`: sidechain lifecycle status normalization now accepts compact/camel aliases such as `inProgress`, `completedSuccessfully`, `cancelledByUser`/`canceledByUser`, `failedError`/`failedWithError`, and `timedOut`, while still writing canonical running/completed/cancelled/failed states.
 - `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

@@ -238,22 +238,33 @@ func sidechainStatusField(value any, keys ...string) string {
 }
 
 func normalizeSidechainStatus(status string) string {
-	switch strings.ToLower(strings.TrimSpace(status)) {
+	status = strings.TrimSpace(status)
+	switch normalizeSidechainStatusAlias(status) {
 	case "":
 		return ""
-	case SidechainStatusRunning, "started", "active", "in_progress", "in-progress", "pending":
+	case SidechainStatusRunning, "started", "active", "inprogress", "pending", "queued":
 		return SidechainStatusRunning
-	case SidechainStatusCompleted, "complete", "completed_successfully", "success", "succeeded", "done", "ok":
+	case SidechainStatusCompleted, "complete", "completedsuccessfully", "success", "successful", "succeeded", "done", "ok":
 		return SidechainStatusCompleted
-	case SidechainStatusCancelled, "canceled", "cancel", "cancelled_by_user", "canceled_by_user", "aborted", "stopped":
+	case SidechainStatusCancelled, "canceled", "cancel", "cancelledbyuser", "canceledbyuser", "usercancelled", "usercanceled", "aborted", "stopped":
 		return SidechainStatusCancelled
-	case SidechainStatusFailed, "failure", "error", "errored", "failed_error":
+	case SidechainStatusFailed, "failure", "error", "errored", "failederror", "failedwitherror", "timeout", "timedout":
 		return SidechainStatusFailed
 	default:
-		return strings.TrimSpace(status)
+		return status
 	}
 }
 
+func normalizeSidechainStatusAlias(status string) string {
+	var builder strings.Builder
+	for _, r := range strings.TrimSpace(status) {
+		if unicode.IsLetter(r) || unicode.IsDigit(r) {
+			builder.WriteRune(unicode.ToLower(r))
+		}
+	}
+	return builder.String()
+}
+
 func ListSidechainStates(sessionPath string, sessionID contracts.ID) ([]SidechainState, error) {
 	infos, err := ListSidechainTranscripts(sessionPath, sessionID)
 	if err != nil {

internal/session/sidechain_test.go

@@ -189,7 +189,7 @@ func TestLoadSidechainStateAcceptsSubtypeAndStatusAliases(t *testing.T) {
 		Content: map[string]any{
 			"subagent_id":    "subagent_42",
 			"subagentType":   "explorer",
-			"lifecycleState": "active",
+			"lifecycleState": "inProgress",
 		},
 	}); err != nil {
 		t.Fatal(err)
@@ -201,7 +201,7 @@ func TestLoadSidechainStateAcceptsSubtypeAndStatusAliases(t *testing.T) {
 		Subtype:   "agent_finish",
 		Content: map[string]any{
 			"agentID":      "subagent_42",
-			"outcome":      "success",
+			"outcome":      "completedSuccessfully",
 			"finalSummary": "found the issue",
 		},
 	}); err != nil {
@@ -221,6 +221,26 @@ func TestLoadSidechainStateAcceptsSubtypeAndStatusAliases(t *testing.T) {
 	}
 }
 
+func TestNormalizeSidechainStatusAcceptsCompactAliases(t *testing.T) {
+	cases := map[string]string{
+		"inProgress":            SidechainStatusRunning,
+		"in-progress":           SidechainStatusRunning,
+		"completedSuccessfully": SidechainStatusCompleted,
+		"successful":            SidechainStatusCompleted,
+		"cancelledByUser":       SidechainStatusCancelled,
+		"canceledByUser":        SidechainStatusCancelled,
+		"failedError":           SidechainStatusFailed,
+		"failed_with_error":     SidechainStatusFailed,
+		"timedOut":              SidechainStatusFailed,
+		"custom_state":          "custom_state",
+	}
+	for input, want := range cases {
+		if got := normalizeSidechainStatus(input); got != want {
+			t.Fatalf("normalizeSidechainStatus(%q) = %q, want %q", input, got, want)
+		}
+	}
+}
+
 func TestLoadSidechainStateAcceptsAdjacentLifecycleSubtypeAliases(t *testing.T) {
 	sessionPath := filepath.Join(t.TempDir(), "session.jsonl")
 	sessionID := contracts.ID("sess_1")
@@ -631,7 +651,7 @@ func TestSidechainFinishNormalizesStatusAliases(t *testing.T) {
 	if _, err := manager.Start(SidechainOptions{ID: "alias-success", StartedAt: time.Unix(100, 0).UTC()}); err != nil {
 		t.Fatal(err)
 	}
-	summary, err := manager.Finish("alias-success", "success", "done", time.Unix(110, 0).UTC())
+	summary, err := manager.Finish("alias-success", "completedSuccessfully", "done", time.Unix(110, 0).UTC())
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -649,7 +669,7 @@ func TestSidechainFinishNormalizesStatusAliases(t *testing.T) {
 	if _, err := manager.Start(SidechainOptions{ID: "alias-error", StartedAt: time.Unix(120, 0).UTC()}); err != nil {
 		t.Fatal(err)
 	}
-	failed, err := manager.Finish("alias-error", "error", "boom", time.Unix(130, 0).UTC())
+	failed, err := manager.Finish("alias-error", "failedError", "boom", time.Unix(130, 0).UTC())
 	if err != nil {
 		t.Fatal(err)
 	}