fifony 0.1.39 → 0.1.40

package/dist/{chunk-UNYIR5AK.js → chunk-O3FGX4J6.js}

@@ -6,7 +6,7 @@ import {
   idToSafePath,
   now,
   renderPrompt
-} from "./chunk-T2YJOZ6N.js";
+} from "./chunk-EPY5TTQK.js";
 import {
   SOURCE_MARKER,
   SOURCE_ROOT,
@@ -278,7 +278,11 @@ var CLAUDE_RESULT_SCHEMA = JSON.stringify({
   properties: {
     status: { type: "string", enum: ["done", "continue", "blocked", "failed"] },
     summary: { type: "string" },
-    nextPrompt: { type: "string" }
+    nextPrompt: { type: "string" },
+    tools_used: { type: "array", items: { type: "string" } },
+    skills_used: { type: "array", items: { type: "string" } },
+    agents_used: { type: "array", items: { type: "string" } },
+    commands_run: { type: "array", items: { type: "string" } }
   },
   required: ["status"]
 });
@@ -951,7 +955,11 @@ Return a JSON object with this exact schema when finished:
   "validation": { "commands_run": ["..."], "result": "pass" | "partial" | "fail" },
   "open_questions": ["..."],
   "followups": ["..."],
-  "nextPrompt": "guidance for next turn if status is continue"
+  "nextPrompt": "guidance for next turn if status is continue",
+  "tools_used": ["list of tools you used, e.g. Read, Write, Edit, Bash, Grep, Glob"],
+  "skills_used": ["list of slash commands you invoked, e.g. /commit, /review-pr"],
+  "agents_used": ["list of subagents you spawned, e.g. code-reviewer, build-error-resolver"],
+  "commands_run": ["list of shell commands you executed, e.g. npm test, git status"]
 }
 `.trim();
 function buildCodexCommand(options) {
@@ -1066,7 +1074,11 @@ Return a JSON object with this exact schema when finished:
   "validation": { "commands_run": ["..."], "result": "pass" | "partial" | "fail" },
   "open_questions": ["..."],
   "followups": ["..."],
-  "nextPrompt": "guidance for next turn if status is continue"
+  "nextPrompt": "guidance for next turn if status is continue",
+  "tools_used": ["list of tools you used, e.g. Read, Write, Edit, Bash, Grep, Glob"],
+  "skills_used": ["list of slash commands you invoked, e.g. /commit, /review-pr"],
+  "agents_used": ["list of subagents you spawned, e.g. code-reviewer, build-error-resolver"],
+  "commands_run": ["list of shell commands you executed, e.g. npm test, git status"]
 }
 `.trim();
 function buildGeminiCommand(options) {
@@ -2118,7 +2130,7 @@ function parseDiffStats(issue, raw) {
 }
 async function syncIssueDiffStatsToStore(issue) {
   if (!issue?.id) return;
-  const { getIssueStateResource } = await import("./store-3YSID6N2.js");
+  const { getIssueStateResource } = await import("./store-FNUWCFOX.js");
   const issueResource = getIssueStateResource();
   if (!issueResource) return;
   const toNumber = (value) => {
@@ -2187,7 +2199,7 @@ function ensureWorktreeCommitted(issue) {
     throw new Error(`Worktree for ${issue.identifier} still has uncommitted changes after commit.`);
   }
 }
-function mergeWorktree(issue, worktreePath) {
+function mergeWorktree(issue, worktreePath, abortOnConflict = true) {
   const result = { copied: [], deleted: [], skipped: [], conflicts: [] };
   ensureWorktreeCommitted(issue);
   const currentBranch = execSync("git rev-parse --abbrev-ref HEAD", { cwd: TARGET_ROOT, encoding: "utf8" }).trim();
@@ -2225,11 +2237,15 @@ function mergeWorktree(issue, worktreePath) {
       result.conflicts.push(...conflictOut.trim().split("\n").filter(Boolean));
     } catch {
     }
-    try {
-      execSync("git merge --abort", { cwd: TARGET_ROOT, stdio: "pipe" });
-    } catch {
+    if (abortOnConflict) {
+      try {
+        execSync("git merge --abort", { cwd: TARGET_ROOT, stdio: "pipe" });
+      } catch {
+      }
+      logger.warn({ issueId: issue.id, err: String(err) }, "[Agent] Git merge failed, aborted");
+    } else {
+      logger.info({ issueId: issue.id, conflicts: result.conflicts }, "[Agent] Git merge has conflicts \u2014 leaving markers for agent resolution");
     }
-    logger.warn({ issueId: issue.id, err: String(err) }, "[Agent] Git merge failed, aborted");
   }
   return result;
 }
@@ -2241,10 +2257,10 @@ function shouldSkipMergePath(relativePath) {
   const base = parts.at(-1) ?? "";
   return base === "WORKFLOW.local.md" || base === ".fifony-env.sh" || base === ".fifony-compiled-env.sh" || base === ".fifony-local-source-ready" || base.startsWith("fifony-") || base.startsWith("fifony_");
 }
-function mergeWorkspace(issue) {
+function mergeWorkspace(issue, abortOnConflict = true) {
   ensureGitRepoReadyForWorktrees(TARGET_ROOT, "merge issues");
   assertIssueHasGitWorktree(issue, "merge");
-  return mergeWorktree(issue, issue.worktreePath);
+  return mergeWorktree(issue, issue.worktreePath, abortOnConflict);
 }
 function dryMerge(issue) {
   ensureGitRepoReadyForWorktrees(TARGET_ROOT, "preview merges");
@@ -2381,4 +2397,4 @@ export {
   hydrateIssuePathsFromWorkspace,
   writeVersionedArtifacts
 };
-//# sourceMappingURL=chunk-UNYIR5AK.js.map
+//# sourceMappingURL=chunk-O3FGX4J6.js.map

package/dist/{chunk-WBOBY75G.js → chunk-UXXUTDGV.js}

@@ -1,14 +1,14 @@
 import {
   computeDiffStats,
   syncIssueDiffStatsToStore
-} from "./chunk-UNYIR5AK.js";
+} from "./chunk-O3FGX4J6.js";
 import {
   logger
 } from "./chunk-DVU3CXWA.js";
 import {
   isoWeek,
   now
-} from "./chunk-T2YJOZ6N.js";
+} from "./chunk-EPY5TTQK.js";
 import {
   S3DB_ISSUE_RESOURCE,
   TARGET_ROOT,
@@ -875,4 +875,4 @@ export {
   canTransitionIssue,
   visualizeStateMachine
 };
-//# sourceMappingURL=chunk-WBOBY75G.js.map
+//# sourceMappingURL=chunk-UXXUTDGV.js.map

package/dist/cli.js

@@ -3,12 +3,12 @@ import {
   importReferenceArtifacts,
   listReferenceRepositories,
   syncReferenceRepositories
-} from "./chunk-DWMY2HBG.js";
-import "./chunk-AVSRIV47.js";
-import "./chunk-WBOBY75G.js";
-import "./chunk-UNYIR5AK.js";
+} from "./chunk-LYAI5RPK.js";
+import "./chunk-3QL4QAQ5.js";
+import "./chunk-UXXUTDGV.js";
+import "./chunk-O3FGX4J6.js";
 import "./chunk-DVU3CXWA.js";
-import "./chunk-T2YJOZ6N.js";
+import "./chunk-EPY5TTQK.js";
 import "./chunk-37N5OFHM.js";
 
 // src/cli.ts

package/dist/issue-runner-YZM6WQMY.js

@@ -0,0 +1,15 @@
+import {
+  runIssueOnce,
+  runPlanningJob
+} from "./chunk-LYAI5RPK.js";
+import "./chunk-3QL4QAQ5.js";
+import "./chunk-UXXUTDGV.js";
+import "./chunk-O3FGX4J6.js";
+import "./chunk-DVU3CXWA.js";
+import "./chunk-EPY5TTQK.js";
+import "./chunk-37N5OFHM.js";
+export {
+  runIssueOnce,
+  runPlanningJob
+};
+//# sourceMappingURL=issue-runner-YZM6WQMY.js.map

package/dist/{issue-state-machine-TEIICCAA.js → issue-state-machine-KOZE5JWX.js}

@@ -16,10 +16,10 @@ import {
   setIssueResourceStateApi,
   setIssueStateMachinePlugin,
   visualizeStateMachine
-} from "./chunk-WBOBY75G.js";
-import "./chunk-UNYIR5AK.js";
+} from "./chunk-UXXUTDGV.js";
+import "./chunk-O3FGX4J6.js";
 import "./chunk-DVU3CXWA.js";
-import "./chunk-T2YJOZ6N.js";
+import "./chunk-EPY5TTQK.js";
 import "./chunk-37N5OFHM.js";
 export {
   ISSUE_STATE_MACHINE_ID,
@@ -40,4 +40,4 @@ export {
   setIssueStateMachinePlugin,
   visualizeStateMachine
 };
-//# sourceMappingURL=issue-state-machine-TEIICCAA.js.map
+//# sourceMappingURL=issue-state-machine-KOZE5JWX.js.map

package/dist/{issues-JPMKO2EE.js → issues-7HQC7OIN.js}

@@ -11,14 +11,14 @@ import {
   normalizeIssue,
   transitionIssue,
   validateConfig
-} from "./chunk-DWMY2HBG.js";
-import "./chunk-AVSRIV47.js";
+} from "./chunk-LYAI5RPK.js";
+import "./chunk-3QL4QAQ5.js";
 import {
   computeMetrics
-} from "./chunk-WBOBY75G.js";
-import "./chunk-UNYIR5AK.js";
+} from "./chunk-UXXUTDGV.js";
+import "./chunk-O3FGX4J6.js";
 import "./chunk-DVU3CXWA.js";
-import "./chunk-T2YJOZ6N.js";
+import "./chunk-EPY5TTQK.js";
 import "./chunk-37N5OFHM.js";
 export {
   addEvent,
@@ -35,4 +35,4 @@ export {
   transitionIssue,
   validateConfig
 };
-//# sourceMappingURL=issues-JPMKO2EE.js.map
+//# sourceMappingURL=issues-7HQC7OIN.js.map

package/dist/mcp/server.js

@@ -1,7 +1,7 @@
 import {
   parseIssueState,
   renderPrompt
-} from "../chunk-T2YJOZ6N.js";
+} from "../chunk-EPY5TTQK.js";
 import "../chunk-37N5OFHM.js";
 
 // src/mcp/server.ts

package/dist/{queue-workers-5JOCROD6.js → queue-workers-ZEZHDX7M.js}

@@ -7,7 +7,7 @@ import {
   recoverOrphans,
   recoverState,
   stopQueueWorkers
-} from "./chunk-AVSRIV47.js";
+} from "./chunk-3QL4QAQ5.js";
 import "./chunk-DVU3CXWA.js";
 import "./chunk-37N5OFHM.js";
 export {
@@ -20,4 +20,4 @@ export {
   recoverState,
   stopQueueWorkers
 };
-//# sourceMappingURL=queue-workers-5JOCROD6.js.map
+//# sourceMappingURL=queue-workers-ZEZHDX7M.js.map

package/dist/{scheduler-GAO2MXGZ.js → scheduler-4R4ZAF25.js}

@@ -4,12 +4,12 @@ import {
   hasTerminalQueue,
   installGracefulShutdown,
   isShuttingDown
-} from "./chunk-DWMY2HBG.js";
-import "./chunk-AVSRIV47.js";
-import "./chunk-WBOBY75G.js";
-import "./chunk-UNYIR5AK.js";
+} from "./chunk-LYAI5RPK.js";
+import "./chunk-3QL4QAQ5.js";
+import "./chunk-UXXUTDGV.js";
+import "./chunk-O3FGX4J6.js";
 import "./chunk-DVU3CXWA.js";
-import "./chunk-T2YJOZ6N.js";
+import "./chunk-EPY5TTQK.js";
 import "./chunk-37N5OFHM.js";
 export {
   analyzeParallelizability,
@@ -18,4 +18,4 @@ export {
   installGracefulShutdown,
   isShuttingDown
 };
-//# sourceMappingURL=scheduler-GAO2MXGZ.js.map
+//# sourceMappingURL=scheduler-4R4ZAF25.js.map

package/dist/{store-3YSID6N2.js → store-FNUWCFOX.js}

@@ -21,17 +21,17 @@ import {
   replacePersistedSetting,
   savePlanForIssue,
   setActiveApiPlugin
-} from "./chunk-DWMY2HBG.js";
-import "./chunk-AVSRIV47.js";
+} from "./chunk-LYAI5RPK.js";
+import "./chunk-3QL4QAQ5.js";
 import {
   hasDirtyState,
   markEventDirty,
   markIssueDirty,
   markIssuePlanDirty
-} from "./chunk-WBOBY75G.js";
-import "./chunk-UNYIR5AK.js";
+} from "./chunk-UXXUTDGV.js";
+import "./chunk-O3FGX4J6.js";
 import "./chunk-DVU3CXWA.js";
-import "./chunk-T2YJOZ6N.js";
+import "./chunk-EPY5TTQK.js";
 import "./chunk-37N5OFHM.js";
 export {
   closeStateStore,
@@ -61,4 +61,4 @@ export {
   savePlanForIssue,
   setActiveApiPlugin
 };
-//# sourceMappingURL=store-3YSID6N2.js.map
+//# sourceMappingURL=store-FNUWCFOX.js.map

package/dist/{workspace-ZD5H6YOL.js → workspace-AOHHNWL5.js}

@@ -21,9 +21,9 @@ import {
   shouldSkipMergePath,
   syncIssueDiffStatsToStore,
   writeVersionedArtifacts
-} from "./chunk-UNYIR5AK.js";
+} from "./chunk-O3FGX4J6.js";
 import "./chunk-DVU3CXWA.js";
-import "./chunk-T2YJOZ6N.js";
+import "./chunk-EPY5TTQK.js";
 import "./chunk-37N5OFHM.js";
 export {
   assertIssueHasGitWorktree,
@@ -49,4 +49,4 @@ export {
   syncIssueDiffStatsToStore,
   writeVersionedArtifacts
 };
-//# sourceMappingURL=workspace-ZD5H6YOL.js.map
+//# sourceMappingURL=workspace-AOHHNWL5.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fifony",
-  "version": "0.1.39",
+  "version": "0.1.40",
   "private": false,
   "type": "module",
   "license": "Apache-2.0",