daedalus-cli 3.28.8 → 3.28.9

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [3.28.9](https://github.com/bgill55/daedalus/compare/v3.28.8...v3.28.9) (2026-08-12)
+
+
+### Bug Fixes
+
+* **ui:** single calm render layer + structured run manifest (PR [#110](https://github.com/bgill55/daedalus/issues/110)) ([a5e4526](https://github.com/bgill55/daedalus/commit/a5e4526c1297cd8c60d777edfaca974546eff4f3))
+
 ## [3.28.8](https://github.com/bgill55/daedalus/compare/v3.28.7...v3.28.8) (2026-08-12)
 
 

package/dist/commands/agents-manifest.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=agents-manifest.test.d.ts.map

package/dist/commands/agents-manifest.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"agents-manifest.test.d.ts","sourceRoot":"","sources":["../../src/commands/agents-manifest.test.ts"],"names":[],"mappings":""}

package/dist/commands/agents-manifest.test.js

@@ -0,0 +1,53 @@
+import { describe, it, expect, afterEach } from 'vitest';
+import { mkdtempSync, rmSync, readdirSync, readFileSync, existsSync } from 'node:fs';
+import { join } from 'node:path';
+import { tmpdir } from 'node:os';
+import { writeAutopilotManifest } from './agents.js';
+const origCwd = process.cwd();
+describe('autopilot run manifest', () => {
+    let dir;
+    afterEach(() => {
+        process.chdir(origCwd);
+        if (dir && existsSync(dir))
+            rmSync(dir, { recursive: true, force: true });
+    });
+    it('writes a valid JSON manifest to .daedalus/ with the expected shape', () => {
+        dir = mkdtempSync(join(tmpdir(), 'daedalus-manifest-'));
+        process.chdir(dir);
+        const manifest = {
+            feature: 'add loading spinner',
+            branch: 'daedalus-autopilot-add-loading-spinner',
+            remote: 'bgill55/daedalus',
+            mode: 'git',
+            outcome: 'pr-opened',
+            tasksPlanned: 4,
+            tasksDone: 4,
+            filesChanged: ['src/ui/loading.ts', 'src/ui/spinner.ts'],
+            testResult: { ok: true, detail: '' },
+            finishedAt: new Date().toISOString(),
+        };
+        writeAutopilotManifest(manifest);
+        const daedalusDir = join(dir, '.daedalus');
+        expect(existsSync(daedalusDir)).toBe(true);
+        const files = readdirSync(daedalusDir).filter((f) => f.endsWith('.json'));
+        expect(files.length).toBe(1);
+        const written = JSON.parse(readFileSync(join(daedalusDir, files[0]), 'utf8'));
+        expect(written.feature).toBe('add loading spinner');
+        expect(written.branch).toBe('daedalus-autopilot-add-loading-spinner');
+        expect(written.mode).toBe('git');
+        expect(written.outcome).toBe('pr-opened');
+        expect(written.filesChanged).toEqual(['src/ui/loading.ts', 'src/ui/spinner.ts']);
+        expect(written.testResult.ok).toBe(true);
+    });
+    it('does not throw when run outside a writable location', () => {
+        dir = mkdtempSync(join(tmpdir(), 'daedalus-manifest-'));
+        process.chdir(dir);
+        // Should not throw even though we only test the happy path writes fine.
+        expect(() => writeAutopilotManifest({
+            feature: 'x', branch: 'b', remote: null, mode: 'local-only',
+            outcome: 'committed-local', tasksPlanned: 0, tasksDone: 0,
+            filesChanged: [], testResult: null, finishedAt: '',
+        })).not.toThrow();
+    });
+});
+//# sourceMappingURL=agents-manifest.test.js.map

package/dist/commands/agents-manifest.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"agents-manifest.test.js","sourceRoot":"","sources":["../../src/commands/agents-manifest.test.ts"],"names":[],"mappings":"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"}

package/dist/commands/agents.d.ts

@@ -1,3 +1,21 @@
 import type { Command } from './types.js';
+interface AutopilotManifest {
+    feature: string;
+    branch: string;
+    remote: string | null;
+    mode: 'git' | 'local-only' | 'non-git';
+    outcome: 'committed' | 'committed-local' | 'pr-opened' | 'stopped-verify' | 'stopped-error' | 'no-changes';
+    tasksPlanned: number;
+    tasksDone: number;
+    filesChanged: string[];
+    testResult: {
+        ok: boolean;
+        detail: string;
+    } | null;
+    finishedAt: string;
+}
+declare function writeAutopilotManifest(m: AutopilotManifest): void;
+export { writeAutopilotManifest };
+export type { AutopilotManifest };
 export declare const agentCommands: Command[];
 //# sourceMappingURL=agents.d.ts.map

package/dist/commands/agents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agents.d.ts","sourceRoot":"","sources":["../../src/commands/agents.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAgE1C,eAAO,MAAM,aAAa,EAAE,OAAO,EA2sClC,CAAA"}
+{"version":3,"file":"agents.d.ts","sourceRoot":"","sources":["../../src/commands/agents.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAoE1C,UAAU,iBAAiB;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,IAAI,EAAE,KAAK,GAAG,YAAY,GAAG,SAAS,CAAC;IACvC,OAAO,EAAE,WAAW,GAAG,iBAAiB,GAAG,WAAW,GAAG,gBAAgB,GAAG,eAAe,GAAG,YAAY,CAAC;IAC3G,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,UAAU,EAAE;QAAE,EAAE,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACnD,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,iBAAS,sBAAsB,CAAC,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAU1D;AAED,OAAO,EAAE,sBAAsB,EAAE,CAAC;AAClC,YAAY,EAAE,iBAAiB,EAAE,CAAC;AAElC,eAAO,MAAM,aAAa,EAAE,OAAO,EA0uClC,CAAA"}

package/dist/commands/agents.js

@@ -39,7 +39,7 @@ function safeGitAdd(cwd) {
         const exclude = staged.filter((f) => SECRET_FILE_PATTERN.test(f) || isGitIgnored(cwd, f));
         if (exclude.length > 0) {
             execSync(`git reset -q -- ${exclude.map((f) => JSON.stringify(f)).join(' ')}`, { cwd, stdio: 'ignore' });
-            console.log(pc.yellow(`[CHECK] Excluded ${exclude.length} secret/ignored file(s) from commit (e.g. .env) — not staged.`));
+            console.log(pc.dim(`[CHECK] Excluded ${exclude.length} secret/ignored file(s) from commit (e.g. .env) — not staged.`));
         }
     }
     catch {
@@ -75,6 +75,19 @@ async function runAutopilotVerify(cwd) {
     }
     return { ok: true, detail: '' };
 }
+function writeAutopilotManifest(m) {
+    try {
+        const dir = path.join(process.cwd(), '.daedalus');
+        fs.mkdirSync(dir, { recursive: true });
+        const file = path.join(dir, `run-${Date.now()}.json`);
+        fs.writeFileSync(file, JSON.stringify(m, null, 2), 'utf8');
+        console.log(pc.dim(`[INFO] Run manifest written to ${file}`));
+    }
+    catch {
+        // best-effort — manifest is a convenience, never block the session on it
+    }
+}
+export { writeAutopilotManifest };
 export const agentCommands = [
     {
         name: '/spawn',
@@ -828,186 +841,219 @@ export const agentCommands = [
                 console.log(pc.yellow('[WARN] Usage: /autopilot <feature description>'));
                 return;
             }
-            let isGitRepo = true;
+            const manifest = {
+                feature: idea,
+                branch: '',
+                remote: null,
+                mode: 'non-git',
+                outcome: 'stopped-error',
+                tasksPlanned: 0,
+                tasksDone: 0,
+                filesChanged: [],
+                testResult: null,
+                finishedAt: '',
+            };
+            const emitManifest = () => {
+                manifest.finishedAt = new Date().toISOString();
+                writeAutopilotManifest(manifest);
+            };
             try {
-                execSync('git rev-parse --is-inside-work-tree', { cwd: ctx.toolContext.projectRoot, stdio: 'ignore' });
-            }
-            catch {
-                isGitRepo = false;
-            }
-            if (!isGitRepo) {
-                console.log(pc.cyan('[INFO] Non-git directory detected. Auto-initializing Git repository for autonomous branch safety...'));
+                let isGitRepo = true;
                 try {
-                    const cwd = ctx.toolContext.projectRoot || process.cwd();
-                    execSync('git init', { cwd });
-                    const gitIgnorePath = path.join(cwd, '.gitignore');
-                    if (!fs.existsSync(gitIgnorePath)) {
-                        fs.writeFileSync(gitIgnorePath, "node_modules/\ndist/\n.daedalus/\n", 'utf8');
-                    }
-                    safeGitAdd(cwd);
-                    execSync('git commit -m "initial clean setup"', { cwd });
-                    isGitRepo = true;
-                    console.log(pc.green('[OK] Git repository initialized with tracking branch support.'));
+                    execSync('git rev-parse --is-inside-work-tree', { cwd: ctx.toolContext.projectRoot, stdio: 'ignore' });
                 }
                 catch {
-                    console.log(pc.yellow('[WARNING] Working directory is not a git repository. Autonomous changes will NOT be tracked in a git branch.'));
-                }
-            }
-            const repoInfo = isGitRepo ? getGitRepoInfo(ctx.toolContext.projectRoot) : null;
-            if (!repoInfo) {
-                console.log(pc.yellow('[INFO] No GitHub remote found. Running in local-only mode (no PR will be created).'));
-            }
-            const slug = idea.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-|-$/g, '').slice(0, 40);
-            const branchName = `daedalus-autopilot-${slug}`;
-            if (isGitRepo) {
-                try {
-                    execSync(`git checkout -B ${branchName}`, { cwd: ctx.toolContext.projectRoot });
-                    console.log(pc.green(`[OK] Created branch: ${branchName}`));
+                    isGitRepo = false;
                 }
-                catch (err) {
-                    const msg = err instanceof Error ? errMessage(err) : String(err);
-                    console.log(pc.red(`[ERROR] Failed to create branch: ${msg}`));
-                    return;
-                }
-            }
-            const goal = `Implement the following feature: ${idea}`;
-            console.log(pc.cyan(`\n[AUTOPILOT] Starting autonomous implementation...`));
-            process.env.DAEDALUS_AUTO_APPROVE = 'true';
-            process.env.DAEDALUS_ALLOW_INSTALL = 'true';
-            try {
-                const { Orchestrator } = await import('../agents/orchestrator.js');
-                const orchestrator = new Orchestrator(ctx.router, ctx.messages, ctx.toolContext, ctx.sessionManager, ctx.config?.modelOverride);
-                const result = await orchestrator.run(goal);
-                console.log(pc.white(`\n${result}`));
-                const orchestrationFailed = result.startsWith('Orchestration failed') || result.includes('## Orchestration Hit Verification Failures');
-                const wasAborted = result.includes('## Orchestration Paused');
-                if (orchestrationFailed || wasAborted) {
-                    // Print Self-Evaluating Autopilot Post-Mortem Report before rolling back
-                    const cols = process.stdout.columns || 80;
-                    const lineLen = Math.max(20, Math.min(70, cols - 6));
-                    console.log(`\n  ${pc.bold(pc.red('─ Autopilot Post-Mortem ─'))} ${pc.dim('─'.repeat(Math.max(10, lineLen - 25)))}`);
-                    const failed = orchestrator.results?.filter((r) => !r.success) || [];
-                    if (failed.length > 0) {
-                        failed.forEach((f, idx) => {
-                            console.log(`  ${pc.bold(pc.red(`❌ Failed Step ${idx + 1}:`))} ${pc.bold(`[${f.role}]`)} ${f.goal}`);
-                            console.log(`     ${pc.yellow(`📌 Diagnostic:`)} ${f.summary.split('\n')[0]}`);
-                        });
+                if (!isGitRepo) {
+                    console.log(pc.cyan('[INFO] Non-git directory detected. Auto-initializing Git repository for autonomous branch safety...'));
+                    try {
+                        const cwd = ctx.toolContext.projectRoot || process.cwd();
+                        execSync('git init', { cwd });
+                        const gitIgnorePath = path.join(cwd, '.gitignore');
+                        if (!fs.existsSync(gitIgnorePath)) {
+                            fs.writeFileSync(gitIgnorePath, "node_modules/\ndist/\n.daedalus/\n", 'utf8');
+                        }
+                        safeGitAdd(cwd);
+                        execSync('git commit -m "initial clean setup"', { cwd });
+                        isGitRepo = true;
+                        console.log(pc.green('[OK] Git repository initialized with tracking branch support.'));
                     }
-                    else {
-                        console.log(`  ${pc.yellow('❌ Verification check failed — required files failed artifact or build checks.')}`);
+                    catch {
+                        console.log(pc.yellow('[WARNING] Working directory is not a git repository. Autonomous changes will NOT be tracked in a git branch.'));
                     }
-                    console.log(`\n  ${pc.cyan('💡 Recommendations:')}`);
-                    console.log(`     - Target missing file: ${pc.bold(`/task create <file>`)}`);
-                    console.log(`     - Re-run autopilot:   ${pc.bold(`/autopilot ${idea}`)}`);
-                    console.log(`  ${pc.dim('─'.repeat(lineLen + 2))}\n`);
-                    throw new Error(orchestrationFailed ? 'Orchestration reported failure' : 'Orchestration was paused/aborted');
                 }
-            }
-            catch (err) {
-                const msg = err instanceof Error ? errMessage(err) : String(err);
-                console.log(pc.red(`\n[ERROR] Run stopped: ${msg}`));
+                const repoInfo = isGitRepo ? getGitRepoInfo(ctx.toolContext.projectRoot) : null;
+                if (!repoInfo) {
+                    console.log(pc.yellow('[INFO] No GitHub remote found. Running in local-only mode (no PR will be created).'));
+                }
+                const slug = idea.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-|-$/g, '').slice(0, 40);
+                const branchName = `daedalus-autopilot-${slug}`;
+                manifest.remote = repoInfo ? `${repoInfo.owner}/${repoInfo.repo}` : null;
+                manifest.mode = !isGitRepo ? 'non-git' : repoInfo ? 'git' : 'local-only';
+                manifest.branch = branchName;
                 if (isGitRepo) {
-                    console.log(pc.dim('[CHECK] Verification did not pass — keeping the implemented changes on the branch for review.'));
-                    // In remote-backed repos, discard the failed branch to keep main clean.
-                    // In local-only mode (no remote), keep the branch so the user can
-                    // inspect and fix the work instead of losing it.
-                    if (repoInfo) {
-                        try {
-                            execSync('git reset --hard', { cwd: ctx.toolContext.projectRoot });
-                            execSync('git checkout main', { cwd: ctx.toolContext.projectRoot });
-                            execSync(`git branch -D ${branchName}`, { cwd: ctx.toolContext.projectRoot });
-                            console.log(pc.green('[OK] Branch cleaned up; main is untouched.'));
-                        }
-                        catch (rollbackErr) {
-                            const rbMsg = rollbackErr instanceof Error ? rollbackErr.message : String(rollbackErr);
-                            console.log(pc.red(`[ERROR] Cleanup failed: ${rbMsg}. Manual cleanup may be needed.`));
-                        }
+                    try {
+                        execSync(`git checkout -B ${branchName}`, { cwd: ctx.toolContext.projectRoot });
+                        console.log(pc.green(`[OK] Created branch: ${branchName}`));
                     }
-                    else {
-                        console.log(pc.cyan(`[INFO] Local-only mode: keeping branch '${branchName}' with the implemented changes for inspection. Fix and commit manually.`));
+                    catch (err) {
+                        const msg = err instanceof Error ? errMessage(err) : String(err);
+                        console.log(pc.red(`[ERROR] Failed to create branch: ${msg}`));
+                        return;
                     }
                 }
-                return;
-            }
-            if (isGitRepo) {
-                console.log(pc.cyan('\n[AUTOPILOT] Verifying build & tests before commit...'));
-                const verify = await runAutopilotVerify(ctx.toolContext.projectRoot);
-                if (!verify.ok) {
-                    console.log(pc.red(`\n[ERROR] Verification did not pass — holding the changes on the branch instead of committing. ${verify.detail}`));
-                    console.log(pc.cyan(`[INFO] Branch '${branchName}' is kept with the implemented changes for inspection.`));
-                    return;
-                }
-                console.log(pc.green('[OK] Build & tests passed.'));
-                console.log(pc.cyan('\n[AUTOPILOT] Committing changes...'));
+                const goal = `Implement the following feature: ${idea}`;
+                console.log(pc.cyan(`\n[AUTOPILOT] Starting autonomous implementation...`));
+                process.env.DAEDALUS_AUTO_APPROVE = 'true';
+                process.env.DAEDALUS_ALLOW_INSTALL = 'true';
                 try {
-                    safeGitAdd(ctx.toolContext.projectRoot);
-                    const cleanTitle = idea.replace(/[^a-zA-Z0-9 ]/g, '').trim();
-                    execSync(`git commit -m "feat: ${cleanTitle}"`, { cwd: ctx.toolContext.projectRoot });
-                    console.log(pc.green('[OK] Changes committed.'));
+                    const { Orchestrator } = await import('../agents/orchestrator.js');
+                    const orchestrator = new Orchestrator(ctx.router, ctx.messages, ctx.toolContext, ctx.sessionManager, ctx.config?.modelOverride);
+                    const result = await orchestrator.run(goal);
+                    console.log(pc.white(`\n${result}`));
+                    const orchestrationFailed = result.startsWith('Orchestration failed') || result.includes('## Orchestration Hit Verification Failures');
+                    const wasAborted = result.includes('## Orchestration Paused');
+                    if (orchestrationFailed || wasAborted) {
+                        // Print Self-Evaluating Autopilot Post-Mortem Report before rolling back
+                        const cols = process.stdout.columns || 80;
+                        const lineLen = Math.max(20, Math.min(70, cols - 6));
+                        console.log(`\n  ${pc.bold(pc.red('─ Autopilot Post-Mortem ─'))} ${pc.dim('─'.repeat(Math.max(10, lineLen - 25)))}`);
+                        const failed = orchestrator.results?.filter((r) => !r.success) || [];
+                        if (failed.length > 0) {
+                            failed.forEach((f, idx) => {
+                                console.log(`  ${pc.bold(pc.red(`❌ Failed Step ${idx + 1}:`))} ${pc.bold(`[${f.role}]`)} ${f.goal}`);
+                                console.log(`     ${pc.yellow(`📌 Diagnostic:`)} ${f.summary.split('\n')[0]}`);
+                            });
+                        }
+                        else {
+                            console.log(`  ${pc.yellow('❌ Verification check failed — required files failed artifact or build checks.')}`);
+                        }
+                        console.log(`\n  ${pc.cyan('💡 Recommendations:')}`);
+                        console.log(`     - Target missing file: ${pc.bold(`/task create <file>`)}`);
+                        console.log(`     - Re-run autopilot:   ${pc.bold(`/autopilot ${idea}`)}`);
+                        console.log(`  ${pc.dim('─'.repeat(lineLen + 2))}\n`);
+                        throw new Error(orchestrationFailed ? 'Orchestration reported failure' : 'Orchestration was paused/aborted');
+                    }
                 }
                 catch (err) {
                     const msg = err instanceof Error ? errMessage(err) : String(err);
-                    if (msg.includes('nothing to commit')) {
-                        console.log(pc.yellow('[INFO] No changes to commit.'));
+                    console.log(pc.red(`\n[ERROR] Run stopped: ${msg}`));
+                    manifest.outcome = 'stopped-error';
+                    if (isGitRepo) {
+                        console.log(pc.dim('[CHECK] Verification did not pass — keeping the implemented changes on the branch for review.'));
+                        // In remote-backed repos, discard the failed branch to keep main clean.
+                        // In local-only mode (no remote), keep the branch so the user can
+                        // inspect and fix the work instead of losing it.
+                        if (repoInfo) {
+                            try {
+                                execSync('git reset --hard', { cwd: ctx.toolContext.projectRoot });
+                                execSync('git checkout main', { cwd: ctx.toolContext.projectRoot });
+                                execSync(`git branch -D ${branchName}`, { cwd: ctx.toolContext.projectRoot });
+                                console.log(pc.green('[OK] Branch cleaned up; main is untouched.'));
+                            }
+                            catch (rollbackErr) {
+                                const rbMsg = rollbackErr instanceof Error ? rollbackErr.message : String(rollbackErr);
+                                console.log(pc.red(`[ERROR] Cleanup failed: ${rbMsg}. Manual cleanup may be needed.`));
+                            }
+                        }
+                        else {
+                            console.log(pc.cyan(`[INFO] Local-only mode: keeping branch '${branchName}' with the implemented changes for inspection. Fix and commit manually.`));
+                        }
                     }
-                    else {
-                        console.log(pc.red(`[ERROR] Failed to commit: ${msg}`));
+                    return;
+                }
+                if (isGitRepo) {
+                    console.log(pc.cyan('\n[AUTOPILOT] Verifying build & tests before commit...'));
+                    const verify = await runAutopilotVerify(ctx.toolContext.projectRoot);
+                    if (!verify.ok) {
+                        console.log(pc.red(`\n[ERROR] Verification did not pass — holding the changes on the branch instead of committing. ${verify.detail}`));
+                        console.log(pc.cyan(`[INFO] Branch '${branchName}' is kept with the implemented changes for inspection.`));
+                        manifest.outcome = 'stopped-verify';
+                        manifest.testResult = verify;
                         return;
                     }
-                }
-            }
-            else {
-                console.log(pc.yellow('\n[INFO] Non-git working directory. Autonomous implementation completed directly on files.'));
-            }
-            if (repoInfo) {
-                console.log(pc.cyan('\n[AUTOPILOT] Pushing branch and creating PR...'));
-                let token = process.env.GITHUB_TOKEN || process.env.GH_TOKEN;
-                if (!token) {
+                    console.log(pc.green('[OK] Build & tests passed.'));
+                    console.log(pc.cyan('\n[AUTOPILOT] Committing changes...'));
                     try {
-                        token = execSync('gh auth token', { encoding: 'utf8' }).trim();
+                        safeGitAdd(ctx.toolContext.projectRoot);
+                        const cleanTitle = idea.replace(/[^a-zA-Z0-9 ]/g, '').trim();
+                        execSync(`git commit -m "feat: ${cleanTitle}"`, { cwd: ctx.toolContext.projectRoot });
+                        console.log(pc.green('[OK] Changes committed.'));
+                        try {
+                            const diff = execSync(`git diff --name-only HEAD~1 HEAD`, { cwd: ctx.toolContext.projectRoot, encoding: 'utf8' });
+                            manifest.filesChanged = diff.split('\n').map((s) => s.trim()).filter(Boolean);
+                        }
+                        catch { /* best-effort */ }
                     }
-                    catch {
-                        console.log(pc.yellow('[INFO] No GitHub token found. Run `gh auth login` or set GITHUB_TOKEN.'));
-                        console.log(pc.yellow(`[INFO] Branch ${branchName} is ready locally. Push manually.`));
-                        return;
+                    catch (err) {
+                        const msg = err instanceof Error ? errMessage(err) : String(err);
+                        if (msg.includes('nothing to commit')) {
+                            console.log(pc.yellow('[INFO] No changes to commit.'));
+                        }
+                        else {
+                            console.log(pc.red(`[ERROR] Failed to commit: ${msg}`));
+                            return;
+                        }
                     }
                 }
-                try {
-                    execSync(`git push -u origin ${branchName} --force`, { cwd: ctx.toolContext.projectRoot });
-                    const prResponse = await fetch(`https://api.github.com/repos/${repoInfo.owner}/${repoInfo.repo}/pulls`, {
-                        method: 'POST',
-                        headers: {
-                            'Authorization': `Bearer ${token}`,
-                            'Content-Type': 'application/json',
-                        },
-                        body: JSON.stringify({
-                            title: `[Autopilot] ${idea}`,
-                            head: branchName,
-                            base: 'main',
-                            body: `## Description\n\nAutonomously implemented by Daedalus Autopilot.\n\n**Feature:** ${idea}\n\n---\n_Generated by \`/autopilot\`_`,
-                        }),
-                    });
-                    if (prResponse.ok) {
-                        const pr = await prResponse.json();
-                        console.log(pc.green(`\n[OK] Pull Request created: ${pr.html_url}`));
+                else {
+                    console.log(pc.yellow('\n[INFO] Non-git working directory. Autonomous implementation completed directly on files.'));
+                }
+                if (repoInfo) {
+                    console.log(pc.cyan('\n[AUTOPILOT] Pushing branch and creating PR...'));
+                    let token = process.env.GITHUB_TOKEN || process.env.GH_TOKEN;
+                    if (!token) {
+                        try {
+                            token = execSync('gh auth token', { encoding: 'utf8' }).trim();
+                        }
+                        catch {
+                            console.log(pc.yellow('[INFO] No GitHub token found. Run `gh auth login` or set GITHUB_TOKEN.'));
+                            console.log(pc.yellow(`[INFO] Branch ${branchName} is ready locally. Push manually.`));
+                            return;
+                        }
                     }
-                    else {
-                        const errText = await prResponse.text();
-                        console.log(pc.red(`[ERROR] Failed to create PR: ${prResponse.status} ${errText}`));
-                        console.log(pc.yellow(`[INFO] Branch ${branchName} is pushed. Create PR manually.`));
+                    try {
+                        execSync(`git push -u origin ${branchName} --force`, { cwd: ctx.toolContext.projectRoot });
+                        const prResponse = await fetch(`https://api.github.com/repos/${repoInfo.owner}/${repoInfo.repo}/pulls`, {
+                            method: 'POST',
+                            headers: {
+                                'Authorization': `Bearer ${token}`,
+                                'Content-Type': 'application/json',
+                            },
+                            body: JSON.stringify({
+                                title: `[Autopilot] ${idea}`,
+                                head: branchName,
+                                base: 'main',
+                                body: `## Description\n\nAutonomously implemented by Daedalus Autopilot.\n\n**Feature:** ${idea}\n\n---\n_Generated by \`/autopilot\`_`,
+                            }),
+                        });
+                        if (prResponse.ok) {
+                            const pr = await prResponse.json();
+                            console.log(pc.green(`\n[OK] Pull Request created: ${pr.html_url}`));
+                        }
+                        else {
+                            const errText = await prResponse.text();
+                            console.log(pc.red(`[ERROR] Failed to create PR: ${prResponse.status} ${errText}`));
+                            console.log(pc.yellow(`[INFO] Branch ${branchName} is pushed. Create PR manually.`));
+                        }
+                    }
+                    catch (err) {
+                        const msg = err instanceof Error ? errMessage(err) : String(err);
+                        console.log(pc.red(`[ERROR] Push/PR failed: ${msg}`));
+                        console.log(pc.yellow(`[INFO] Branch ${branchName} is ready locally.`));
                     }
                 }
-                catch (err) {
-                    const msg = err instanceof Error ? errMessage(err) : String(err);
-                    console.log(pc.red(`[ERROR] Push/PR failed: ${msg}`));
-                    console.log(pc.yellow(`[INFO] Branch ${branchName} is ready locally.`));
+                else {
+                    console.log(pc.yellow('\n[INFO] No GitHub remote configured. Implementation is committed locally.'));
+                    console.log(pc.yellow(`[INFO] Branch: ${branchName}`));
                 }
+                console.log(pc.cyan(`\n[AUTOPILOT] Done! Run 'git checkout main' to return to main branch.`));
+                manifest.outcome = repoInfo ? 'pr-opened' : 'committed-local';
             }
-            else {
-                console.log(pc.yellow('\n[INFO] No GitHub remote configured. Implementation is committed locally.'));
-                console.log(pc.yellow(`[INFO] Branch: ${branchName}`));
+            finally {
+                emitManifest();
             }
-            console.log(pc.cyan(`\n[AUTOPILOT] Done! Run 'git checkout main' to return to main branch.`));
         }
     },
     {