@gh-symphony/cli 0.1.4 → 0.2.2

package/dist/{setup-UJC2WYHQ.js → setup-XNOSJ3RX.js}

@@ -2,7 +2,9 @@
 import {
   abortIfCancelled,
   buildAutomaticStateMappings,
+  collectPriorityLabelNames,
   planWorkflowArtifacts,
+  promptPriorityConfig,
   promptStateMappings,
   renderDryRunPreview,
   resolvePriorityField,
@@ -10,11 +12,11 @@ import {
   validateStateMapping,
   writeEcosystem,
   writeWorkflowPlan
-} from "./chunk-RHLUIMBN.js";
+} from "./chunk-PLBG7TZA.js";
 import {
   initRepoRuntime
-} from "./chunk-DW63WPRE.js";
-import "./chunk-6I753NYO.js";
+} from "./chunk-6PFFGP7S.js";
+import "./chunk-RZ3WO7OV.js";
 import {
   GhAuthError,
   GitHubScopeError,
@@ -25,9 +27,9 @@ import {
   getProjectDetail,
   listUserProjects,
   validateToken
-} from "./chunk-Z3NZOPLZ.js";
-import "./chunk-EWTMSDCE.js";
-import "./chunk-WOVNN5NW.js";
+} from "./chunk-BOM2BYZQ.js";
+import "./chunk-3SKN5L3I.js";
+import "./chunk-4ICDSQCJ.js";
 
 // src/commands/setup.ts
 import * as p from "@clack/prompts";
@@ -198,10 +200,17 @@ async function runNonInteractive(flags, options) {
   const { field: priorityField, ambiguous: ambiguousPriorityFields } = resolvePriorityField(projectDetail, statusField);
   if (ambiguousPriorityFields.length > 0) {
     process.stderr.write(
-      `Warning: Multiple priority-like single-select fields found (${ambiguousPriorityFields.map((field) => `"${field.name}"`).join(", ")}). Skipping tracker.priority_field in non-interactive mode.
+      `Warning: Multiple priority-like single-select fields found (${ambiguousPriorityFields.map((field) => `"${field.name}"`).join(", ")}). Writing disabled priority scaffold in non-interactive mode.
 `
     );
   }
+  const priority = priorityField ? {
+    source: "project-field",
+    field: priorityField.name,
+    values: Object.fromEntries(
+      priorityField.options.map((option, index) => [option.name, index])
+    )
+  } : { source: "disabled" };
   const workflowValidation = validateStateMapping(mappings);
   if (!workflowValidation.valid) {
     process.stderr.write(
@@ -219,6 +228,8 @@ Run setup without --non-interactive for manual mapping.
     projectDetail,
     statusField,
     priorityField,
+    priority,
+    includePriorityTemplates: !priorityField,
     mappings,
     runtime: "codex",
     skipSkills: flags.skipSkills,
@@ -230,6 +241,8 @@ Run setup without --non-interactive for manual mapping.
     projectDetail,
     statusField,
     priorityField,
+    priority,
+    includePriorityTemplates: !priorityField,
     runtime: "codex",
     skipSkills: flags.skipSkills,
     skipContext: flags.skipContext
@@ -325,8 +338,12 @@ async function runInteractive(flags, _options) {
     return;
   }
   const priorityResolution = resolvePriorityField(projectDetail, statusField);
+  const priorityLabelNames = await collectPriorityLabelNames(
+    client,
+    projectDetail.linkedRepositories
+  );
   const mappings = await promptStateMappings(statusField, {
-    stepLabel: priorityResolution.ambiguous.length > 0 ? "Step 2/4" : "Step 2/3"
+    stepLabel: "Step 2/4"
   });
   const workflowValidation = validateStateMapping(mappings);
   if (!workflowValidation.valid) {
@@ -340,32 +357,14 @@ async function runInteractive(flags, _options) {
   for (const warning of workflowValidation.warnings) {
     p.log.warn(`  \u26A0 ${warning}`);
   }
-  const priorityField = priorityResolution.ambiguous.length > 0 ? await (async () => {
-    const selectedId = await abortIfCancelled(
-      p.select({
-        message: "Step 3/4 \u2014 Multiple GitHub Project priority fields look plausible. Select the one Symphony should use:",
-        options: [
-          ...priorityResolution.ambiguous.map((field) => ({
-            value: field.id,
-            label: field.name,
-            hint: `${field.options.length} option${field.options.length === 1 ? "" : "s"}`
-          })),
-          {
-            value: "__skip_priority_field__",
-            label: "Skip priority-aware dispatch",
-            hint: "Leave tracker.priority_field unset"
-          }
-        ]
-      })
-    );
-    if (selectedId === "__skip_priority_field__") {
-      return null;
-    }
-    return priorityResolution.ambiguous.find((field) => field.id === selectedId) ?? null;
-  })() : priorityResolution.field;
+  const { priority, priorityField } = await promptPriorityConfig({
+    priorityResolution,
+    labelNames: priorityLabelNames,
+    stepLabel: "Step 3/4"
+  });
   const promptAssignedOnly = await abortIfCancelled(
     p.confirm({
-      message: `${priorityResolution.ambiguous.length > 0 ? "Step 4/4" : "Step 3/3"} \u2014 Only process issues assigned to the authenticated GitHub user?`,
+      message: `${"Step 4/4"} \u2014 Only process issues assigned to the authenticated GitHub user?`,
       initialValue: flags.assignedOnly ?? false
     })
   );
@@ -377,6 +376,8 @@ async function runInteractive(flags, _options) {
     projectDetail,
     statusField,
     priorityField,
+    priority,
+    includePriorityTemplates: priority.source === "disabled",
     mappings,
     runtime: "codex",
     skipSkills: flags.skipSkills,
@@ -410,6 +411,8 @@ async function runInteractive(flags, _options) {
       projectDetail,
       statusField,
       priorityField,
+      priority,
+      includePriorityTemplates: priority.source === "disabled",
       runtime: "codex",
       skipSkills: flags.skipSkills,
       skipContext: flags.skipContext

package/dist/{upgrade-XYHCUGHT.js → upgrade-ZWUAJLHK.js}

@@ -16,8 +16,8 @@ function execFileAsync(file, args, execFileImpl = execFileCallback) {
   });
 }
 function resolveCurrentCliVersion() {
-  if ("0.1.4".length > 0) {
-    return "0.1.4";
+  if ("0.2.2".length > 0) {
+    return "0.2.2";
   }
   const pkg = JSON.parse(
     readFileSync(new URL("../../package.json", import.meta.url), "utf8")

package/dist/{version-B2AYYGLM.js → version-PLQK6X2P.js}

@@ -2,7 +2,7 @@
 
 // src/commands/version.ts
 var handler = async (_args, options) => {
-  const version = "0.1.4";
+  const version = "0.2.2";
   if (options.json) {
     process.stdout.write(JSON.stringify({ version }) + "\n");
   } else {

package/dist/worker-entry.js

@@ -6,7 +6,7 @@ import {
   normalizeCodexRuntimeEvents,
   prepareCodexRuntimePlan,
   resolveLocalRuntimeLaunchConfig
-} from "./chunk-E7OCBNB2.js";
+} from "./chunk-FAU72YC2.js";
 import {
   DEFAULT_AGENT_INPUT_REQUIRED_REASON,
   classifySessionExit,
@@ -17,7 +17,7 @@ import {
   resolveClaudeCommandBinary,
   resolveWorkflowRuntimeCommand,
   runClaudePreflight
-} from "./chunk-EWTMSDCE.js";
+} from "./chunk-3SKN5L3I.js";
 
 // ../worker/src/index.ts
 import { spawn as spawn2 } from "child_process";
@@ -72,6 +72,7 @@ function resolveMaxNonProductiveTurns(env) {
   return Number.isInteger(parsed) && parsed > 0 ? parsed : DEFAULT_MAX_NONPRODUCTIVE_TURNS;
 }
 function captureTurnWorkspaceSnapshot(cwd) {
+  const headSha = captureGitHeadSha(cwd);
   const result = spawnSync(
     "git",
     ["status", "--porcelain=v1", "--untracked-files=all"],
@@ -83,40 +84,69 @@ function captureTurnWorkspaceSnapshot(cwd) {
   if (result.status !== 0) {
     return {
       fingerprint: null,
-      changedFiles: []
+      changedFiles: [],
+      headSha
     };
   }
   const changedFiles = result.stdout.split(/\r?\n/).map((line) => line.trimEnd()).filter(Boolean).sort();
   return {
     fingerprint: changedFiles.join("\n"),
-    changedFiles
+    changedFiles,
+    headSha
   };
 }
 function evaluateTurnProgress(previous, current) {
+  const headChanged = (previous.headSha !== null || current.headSha !== null) && previous.headSha !== current.headSha;
+  const fingerprintUnchanged = previous.fingerprint !== null && current.fingerprint !== null && previous.fingerprint === current.fingerprint;
   const normalizedPreviousError = normalizeError(previous.lastError);
   const normalizedCurrentError = normalizeError(current.lastError);
   const repeatedError = normalizedPreviousError !== null && normalizedCurrentError !== null && normalizedPreviousError === normalizedCurrentError;
+  if (headChanged) {
+    return {
+      nonProductive: false,
+      repeatedPattern: false,
+      reason: null,
+      headChanged,
+      fingerprintUnchanged
+    };
+  }
   if (repeatedError) {
     return {
       nonProductive: true,
       repeatedPattern: true,
-      reason: `repeated error: ${normalizedCurrentError}`
+      reason: `repeated error: ${normalizedCurrentError}`,
+      headChanged,
+      fingerprintUnchanged
     };
   }
-  const unchangedWorkspace = previous.fingerprint !== null && current.fingerprint !== null && previous.fingerprint === current.fingerprint;
-  if (unchangedWorkspace) {
+  if (fingerprintUnchanged) {
     return {
       nonProductive: true,
       repeatedPattern: true,
-      reason: current.changedFiles.length > 0 ? `workspace diff unchanged (${current.changedFiles.length} tracked change${current.changedFiles.length === 1 ? "" : "s"})` : "workspace unchanged"
+      reason: current.changedFiles.length > 0 ? `workspace diff unchanged (${current.changedFiles.length} tracked change${current.changedFiles.length === 1 ? "" : "s"})` : "workspace unchanged",
+      headChanged,
+      fingerprintUnchanged
     };
   }
   return {
     nonProductive: false,
     repeatedPattern: false,
-    reason: null
+    reason: null,
+    headChanged,
+    fingerprintUnchanged
   };
 }
+function captureGitHeadSha(cwd) {
+  const result = spawnSync("git", ["rev-parse", "HEAD"], {
+    cwd,
+    encoding: "utf8"
+  });
+  if (result.status !== 0) {
+    return null;
+  }
+  const headSha = result.stdout.trim();
+  return headSha.length > 0 ? headSha : null;
+}
 function normalizeError(value) {
   if (typeof value !== "string") {
     return null;
@@ -1049,6 +1079,19 @@ function summarizeRuntimeStderr(stderr) {
   }
   return lines.slice(-3).join(" | ").slice(0, 1e3);
 }
+function formatTurnProgressFingerprint(fingerprint) {
+  if (fingerprint === null) {
+    return { state: "unavailable", length: null, preview: null };
+  }
+  if (fingerprint.length === 0) {
+    return { state: "clean", length: 0, preview: "<clean>" };
+  }
+  return {
+    state: "dirty",
+    length: fingerprint.length,
+    preview: fingerprint.slice(0, 500)
+  };
+}
 async function exitWorkerStartupFailure(message) {
   runtimeState.status = "failed";
   runtimeState.runPhase = "failed";
@@ -1630,6 +1673,31 @@ async function runCodexClientProtocol(child, plan, env, options) {
         previousTurnProgressSnapshot,
         currentTurnProgressSnapshot
       );
+      const progressLogContext = {
+        reason: turnProgress.reason,
+        nonProductive: turnProgress.nonProductive,
+        repeatedPattern: turnProgress.repeatedPattern,
+        headChanged: turnProgress.headChanged,
+        fingerprintUnchanged: turnProgress.fingerprintUnchanged,
+        previous: {
+          fingerprint: formatTurnProgressFingerprint(
+            previousTurnProgressSnapshot.fingerprint
+          ),
+          changedFilesCount: previousTurnProgressSnapshot.changedFiles.length,
+          headSha: previousTurnProgressSnapshot.headSha
+        },
+        current: {
+          fingerprint: formatTurnProgressFingerprint(
+            currentTurnProgressSnapshot.fingerprint
+          ),
+          changedFilesCount: currentTurnProgressSnapshot.changedFiles.length,
+          headSha: currentTurnProgressSnapshot.headSha
+        }
+      };
+      process.stderr.write(
+        `[worker] turn progress evaluation ${JSON.stringify(progressLogContext)}
+`
+      );
       previousTurnProgressSnapshot = currentTurnProgressSnapshot;
       if (turnProgress.nonProductive) {
         consecutiveNonProductiveTurns += 1;

package/dist/{workflow-WSXHMO5B.js → workflow-2ERPNGRB.js}

@@ -6,12 +6,13 @@ import {
   resetWorkflowCommandDependenciesForTest,
   setWorkflowCommandDependenciesForTest,
   workflow_default
-} from "./chunk-HT3FAJAO.js";
-import "./chunk-RHLUIMBN.js";
-import "./chunk-YIARPBOR.js";
-import "./chunk-Z3NZOPLZ.js";
-import "./chunk-EWTMSDCE.js";
-import "./chunk-WOVNN5NW.js";
+} from "./chunk-27UZ6KX2.js";
+import "./chunk-PLBG7TZA.js";
+import "./chunk-X4QSP3AX.js";
+import "./chunk-FAU72YC2.js";
+import "./chunk-BOM2BYZQ.js";
+import "./chunk-3SKN5L3I.js";
+import "./chunk-4ICDSQCJ.js";
 export {
   workflow_default as default,
   parseIssueReference,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gh-symphony/cli",
-  "version": "0.1.4",
+  "version": "0.2.2",
   "license": "MIT",
   "author": "hojinzs",
   "description": "Interactive CLI for GitHub Symphony orchestration",
@@ -42,11 +42,11 @@
   "devDependencies": {
     "tsup": "^8.5.1",
     "@gh-symphony/core": "0.0.14",
-    "@gh-symphony/control-plane": "0.0.15",
     "@gh-symphony/orchestrator": "0.0.14",
-    "@gh-symphony/dashboard": "0.0.14",
+    "@gh-symphony/control-plane": "0.0.15",
     "@gh-symphony/runtime-claude": "0.0.14",
     "@gh-symphony/tracker-github": "0.0.14",
+    "@gh-symphony/dashboard": "0.0.14",
     "@gh-symphony/worker": "0.0.14"
   },
   "scripts": {