@renseiai/agentfactory 0.8.16 → 0.8.17

package/dist/src/orchestrator/completion-contracts.js

@@ -29,7 +29,7 @@ const FIELD = {
     commitsPresent: {
         type: 'commits_present',
         label: 'Commits on branch',
-        backstopCapable: false,
+        backstopCapable: true,
     },
     workResult: {
         type: 'work_result',

package/dist/src/orchestrator/completion-contracts.test.js

@@ -89,7 +89,7 @@ describe('validateCompletion', () => {
         expect(result.missingFields).toContain('branch_pushed');
         expect(result.backstopRecoverable).toContain('branch_pushed');
     });
-    it('marks commits_present as not backstop-capable', () => {
+    it('marks commits_present as backstop-capable', () => {
         const contract = getCompletionContract('development');
         const outputs = {
             prUrl: 'https://github.com/org/repo/pull/1',
@@ -98,8 +98,8 @@ describe('validateCompletion', () => {
         };
         const result = validateCompletion(contract, outputs);
         expect(result.satisfied).toBe(false);
-        expect(result.manualRequired).toContain('commits_present');
-        expect(result.backstopRecoverable).not.toContain('commits_present');
+        expect(result.backstopRecoverable).toContain('commits_present');
+        expect(result.manualRequired).not.toContain('commits_present');
     });
     it('marks satisfied for QA with work result passed', () => {
         const contract = getCompletionContract('qa');

package/dist/src/orchestrator/session-backstop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-backstop.d.ts","sourceRoot":"","sources":["../../../src/orchestrator/session-backstop.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,OAAO,KAAK,EAEV,cAAc,EACd,kBAAkB,EAClB,0BAA0B,EAC1B,cAAc,EACf,MAAM,2BAA2B,CAAA;AAWlC,gDAAgD;AAChD,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,YAAY,CAAA;IACnB,iEAAiE;IACjE,aAAa,EAAE,OAAO,CAAA;IACtB,sDAAsD;IACtD,YAAY,EAAE,OAAO,CAAA;IACrB,2CAA2C;IAC3C,gBAAgB,EAAE,OAAO,CAAA;CAC1B;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,cAAc,GAAG,cAAc,CA8BzE;AAMD,uCAAuC;AACvC,MAAM,WAAW,eAAe;IAC9B,iFAAiF;IACjF,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,qEAAqE;IACrE,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,oEAAoE;IACpE,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,WAAW,CACzB,GAAG,EAAE,cAAc,EACnB,OAAO,CAAC,EAAE,eAAe,GACxB,iBAAiB,CAkGnB;AAED,oCAAoC;AACpC,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,kBAAkB,GAAG,IAAI,CAAA;IACnC,OAAO,EAAE,cAAc,CAAA;IACvB,UAAU,EAAE,0BAA0B,GAAG,IAAI,CAAA;IAC7C,QAAQ,EAAE,cAAc,CAAA;IACxB,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAA;CACjC;AA8QD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA8C9E"}
+{"version":3,"file":"session-backstop.d.ts","sourceRoot":"","sources":["../../../src/orchestrator/session-backstop.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,OAAO,KAAK,EAEV,cAAc,EACd,kBAAkB,EAClB,0BAA0B,EAC1B,cAAc,EACf,MAAM,2BAA2B,CAAA;AAWlC,gDAAgD;AAChD,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,YAAY,CAAA;IACnB,iEAAiE;IACjE,aAAa,EAAE,OAAO,CAAA;IACtB,sDAAsD;IACtD,YAAY,EAAE,OAAO,CAAA;IACrB,2CAA2C;IAC3C,gBAAgB,EAAE,OAAO,CAAA;CAC1B;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,cAAc,GAAG,cAAc,CA8BzE;AAMD,uCAAuC;AACvC,MAAM,WAAW,eAAe;IAC9B,iFAAiF;IACjF,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,qEAAqE;IACrE,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,oEAAoE;IACpE,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,WAAW,CACzB,GAAG,EAAE,cAAc,EACnB,OAAO,CAAC,EAAE,eAAe,GACxB,iBAAiB,CAwHnB;AAED,oCAAoC;AACpC,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,kBAAkB,GAAG,IAAI,CAAA;IACnC,OAAO,EAAE,cAAc,CAAA;IACvB,UAAU,EAAE,0BAA0B,GAAG,IAAI,CAAA;IAC7C,QAAQ,EAAE,cAAc,CAAA;IACxB,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAA;CACjC;AAyUD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA8C9E"}

package/dist/src/orchestrator/session-backstop.js

@@ -91,6 +91,27 @@ export function runBackstop(ctx, options) {
     const actions = [];
     for (const fieldType of validation.backstopRecoverable) {
         switch (fieldType) {
+            case 'commits_present': {
+                // Auto-commit uncommitted changes for code-producing work types only
+                if (!ctx.agent.worktreePath) {
+                    actions.push({
+                        field: 'commits_present',
+                        action: 'skipped — no worktree path',
+                        success: false,
+                    });
+                    break;
+                }
+                if (options?.dryRun) {
+                    actions.push({ field: 'commits_present', action: 'would auto-commit uncommitted changes', success: false, detail: 'dry-run' });
+                    break;
+                }
+                const commitResult = backstopCommitChanges(ctx.agent.worktreePath, ctx.agent.identifier);
+                actions.push(commitResult);
+                if (commitResult.success) {
+                    outputs.commitsPresent = true;
+                }
+                break;
+            }
             case 'branch_pushed': {
                 if (options?.dryRun) {
                     actions.push({ field: 'branch_pushed', action: 'would push branch', success: false, detail: 'dry-run' });
@@ -310,6 +331,58 @@ function backstopPushBranch(worktreePath) {
         };
     }
 }
+function backstopCommitChanges(worktreePath, identifier) {
+    try {
+        // Check if there are actually uncommitted changes
+        const status = execSync('git status --porcelain', {
+            cwd: worktreePath,
+            encoding: 'utf-8',
+            timeout: 10000,
+        }).trim();
+        if (status.length === 0) {
+            return {
+                field: 'commits_present',
+                action: 'skipped — no uncommitted changes to commit',
+                success: false,
+                detail: 'Worktree is clean',
+            };
+        }
+        // Stage all changes and commit
+        execSync('git add -A', {
+            cwd: worktreePath,
+            encoding: 'utf-8',
+            timeout: 30000,
+        });
+        execSync(`git commit -m "feat: ${identifier} (auto-committed by session backstop)"`, {
+            cwd: worktreePath,
+            encoding: 'utf-8',
+            timeout: 30000,
+            env: {
+                ...process.env,
+                // Ensure commit succeeds even without global git config
+                GIT_AUTHOR_NAME: process.env.GIT_AUTHOR_NAME ?? 'AgentFactory Backstop',
+                GIT_AUTHOR_EMAIL: process.env.GIT_AUTHOR_EMAIL ?? 'backstop@agentfactory.dev',
+                GIT_COMMITTER_NAME: process.env.GIT_COMMITTER_NAME ?? 'AgentFactory Backstop',
+                GIT_COMMITTER_EMAIL: process.env.GIT_COMMITTER_EMAIL ?? 'backstop@agentfactory.dev',
+            },
+        });
+        const changedFiles = status.split('\n').length;
+        return {
+            field: 'commits_present',
+            action: `auto-committed ${changedFiles} file(s)`,
+            success: true,
+            detail: `${changedFiles} file(s) committed for ${identifier}`,
+        };
+    }
+    catch (error) {
+        return {
+            field: 'commits_present',
+            action: 'failed to auto-commit changes',
+            success: false,
+            detail: error instanceof Error ? error.message : String(error),
+        };
+    }
+}
 function backstopCreatePR(agent, options) {
     const worktreePath = agent.worktreePath;
     if (!worktreePath) {

package/dist/src/orchestrator/session-backstop.test.js

@@ -188,6 +188,71 @@ describe('runBackstop', () => {
         expect(result.validation.satisfied).toBe(false);
         expect(result.backstop.remainingGaps).toContain('comment_posted');
     });
+    it('auto-commits uncommitted changes for development work type', () => {
+        // collectSessionOutputs: no commits ahead of main, branch not pushed
+        mockExecSync
+            // --- collectSessionOutputs ---
+            .mockReturnValueOnce('SUP-123\n') // hasCommits: git branch
+            .mockReturnValueOnce('0\n') // hasCommits: rev-list (no commits)
+            .mockReturnValueOnce('SUP-123\n') // isBranchPushed: git branch
+            .mockReturnValueOnce('') // isBranchPushed: ls-remote (not pushed)
+            // --- backstopCommitChanges ---
+            .mockReturnValueOnce(' M src/foo.ts\n?? src/bar.ts\n') // git status --porcelain
+            .mockReturnValueOnce('') // git add -A
+            .mockReturnValueOnce('') // git commit
+            // --- backstopPushBranch ---
+            .mockReturnValueOnce('SUP-123\n') // git branch
+            .mockReturnValueOnce('') // git push
+            // --- backstopCreatePR ---
+            .mockReturnValueOnce('SUP-123\n') // git branch
+            .mockReturnValueOnce('[]') // gh pr list
+            .mockReturnValueOnce('https://github.com/org/repo/pull/99\n'); // gh pr create
+        const ctx = createSessionContext({
+            agent: createMockAgent({
+                workType: 'development',
+                worktreePath: '/tmp/worktree',
+            }),
+        });
+        const result = runBackstop(ctx);
+        const commitAction = result.backstop.actions.find(a => a.field === 'commits_present');
+        expect(commitAction).toBeDefined();
+        expect(commitAction.success).toBe(true);
+        expect(commitAction.action).toContain('auto-committed');
+        const pushAction = result.backstop.actions.find(a => a.field === 'branch_pushed');
+        expect(pushAction).toBeDefined();
+        expect(pushAction.success).toBe(true);
+        const prAction = result.backstop.actions.find(a => a.field === 'pr_url');
+        expect(prAction).toBeDefined();
+        expect(prAction.success).toBe(true);
+    });
+    it('does not auto-commit for non-code-producing work types', () => {
+        // QA work type has no commits_present requirement — backstop should not commit
+        const ctx = createSessionContext({
+            agent: createMockAgent({ workType: 'qa', worktreePath: '/tmp/worktree' }),
+            commentPosted: true,
+        });
+        const result = runBackstop(ctx);
+        const commitAction = result.backstop.actions.find(a => a.field === 'commits_present');
+        expect(commitAction).toBeUndefined();
+    });
+    it('skips auto-commit in dry-run mode', () => {
+        mockExecSync
+            .mockReturnValueOnce('SUP-123\n') // hasCommits: git branch
+            .mockReturnValueOnce('0\n') // hasCommits: rev-list
+            .mockReturnValueOnce('SUP-123\n') // isBranchPushed: git branch
+            .mockReturnValueOnce(''); // isBranchPushed: ls-remote
+        const ctx = createSessionContext({
+            agent: createMockAgent({
+                workType: 'development',
+                worktreePath: '/tmp/worktree',
+            }),
+        });
+        const result = runBackstop(ctx, { dryRun: true });
+        const commitAction = result.backstop.actions.find(a => a.field === 'commits_present');
+        expect(commitAction).toBeDefined();
+        expect(commitAction.success).toBe(false);
+        expect(commitAction.detail).toBe('dry-run');
+    });
     it('reports satisfied for backlog-creation with sub-issues', () => {
         const ctx = createSessionContext({
             agent: createMockAgent({ workType: 'backlog-creation' }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@renseiai/agentfactory",
-  "version": "0.8.16",
+  "version": "0.8.17",
   "type": "module",
   "description": "Multi-agent fleet management for coding agents — orchestrator, providers, crash recovery",
   "author": "Rensei AI (https://rensei.ai)",
@@ -56,7 +56,7 @@
     "@types/node": "^22.5.4",
     "typescript": "^5.7.3",
     "vitest": "^3.2.3",
-    "@renseiai/create-agentfactory-app": "0.8.16"
+    "@renseiai/create-agentfactory-app": "0.8.17"
   },
   "scripts": {
     "build": "tsc",