cli-jaw 2.1.0 → 2.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.ja.md +8 -6
- package/README.ko.md +8 -6
- package/README.md +12 -6
- package/README.zh-CN.md +8 -6
- package/dist/bin/cli-jaw.js +5 -1
- package/dist/bin/cli-jaw.js.map +1 -1
- package/dist/bin/commands/browser.js +1 -1
- package/dist/bin/commands/browser.js.map +1 -1
- package/dist/bin/commands/chat.js +98 -58
- package/dist/bin/commands/chat.js.map +1 -1
- package/dist/bin/commands/dispatch.js +130 -5
- package/dist/bin/commands/dispatch.js.map +1 -1
- package/dist/bin/commands/goal.js +18 -6
- package/dist/bin/commands/goal.js.map +1 -1
- package/dist/bin/commands/orchestrate.js.map +1 -1
- package/dist/bin/commands/tui/fullscreen-mode.js +237 -0
- package/dist/bin/commands/tui/fullscreen-mode.js.map +1 -0
- package/dist/bin/commands/tui/input-handler.js +139 -52
- package/dist/bin/commands/tui/input-handler.js.map +1 -1
- package/dist/bin/commands/tui/overlays.js +177 -70
- package/dist/bin/commands/tui/overlays.js.map +1 -1
- package/dist/bin/commands/tui/renderer.js +70 -20
- package/dist/bin/commands/tui/renderer.js.map +1 -1
- package/dist/bin/commands/tui/simple-mode.js +1 -1
- package/dist/bin/commands/tui/simple-mode.js.map +1 -1
- package/dist/bin/commands/tui/tui-io.js +8 -0
- package/dist/bin/commands/tui/tui-io.js.map +1 -0
- package/dist/bin/commands/tui/types.js +9 -0
- package/dist/bin/commands/tui/types.js.map +1 -1
- package/dist/bin/commands/tui/ws-handler.js +115 -23
- package/dist/bin/commands/tui/ws-handler.js.map +1 -1
- package/dist/bin/commands/worker.js +159 -0
- package/dist/bin/commands/worker.js.map +1 -0
- package/dist/bin/postinstall.js +0 -76
- package/dist/bin/postinstall.js.map +1 -1
- package/dist/lib/mcp/format-converters.js +21 -2
- package/dist/lib/mcp/format-converters.js.map +1 -1
- package/dist/lib/mcp/mcp-registry.js +75 -0
- package/dist/lib/mcp/mcp-registry.js.map +1 -0
- package/dist/lib/stt.js +1 -1
- package/dist/lib/stt.js.map +1 -1
- package/dist/scripts/fresh-install-smoke.js +1 -1
- package/dist/scripts/fresh-install-smoke.js.map +1 -1
- package/dist/server.js +27 -6
- package/dist/server.js.map +1 -1
- package/dist/src/agent/args.js +33 -1
- package/dist/src/agent/args.js.map +1 -1
- package/dist/src/agent/claude-e-runtime.js +1 -1
- package/dist/src/agent/claude-e-runtime.js.map +1 -1
- package/dist/src/agent/codex-app-client.js +1 -1
- package/dist/src/agent/error-classifier.js +6 -1
- package/dist/src/agent/error-classifier.js.map +1 -1
- package/dist/src/agent/events/claude.js +1 -0
- package/dist/src/agent/events/claude.js.map +1 -1
- package/dist/src/agent/events/codex.js +0 -44
- package/dist/src/agent/events/codex.js.map +1 -1
- package/dist/src/agent/events/helpers.js +52 -5
- package/dist/src/agent/events/helpers.js.map +1 -1
- package/dist/src/agent/events/opencode.js +6 -2
- package/dist/src/agent/events/opencode.js.map +1 -1
- package/dist/src/agent/events/summary.js +3 -2
- package/dist/src/agent/events/summary.js.map +1 -1
- package/dist/src/agent/events/tool-labels.js +8 -5
- package/dist/src/agent/events/tool-labels.js.map +1 -1
- package/dist/src/agent/kiro-auth.js +213 -0
- package/dist/src/agent/kiro-auth.js.map +1 -0
- package/dist/src/agent/kiro-models.js +79 -0
- package/dist/src/agent/kiro-models.js.map +1 -0
- package/dist/src/agent/kiro-runtime.js +306 -0
- package/dist/src/agent/kiro-runtime.js.map +1 -0
- package/dist/src/agent/lifecycle-handler.js +190 -12
- package/dist/src/agent/lifecycle-handler.js.map +1 -1
- package/dist/src/agent/memory-flush-controller.js +1 -3
- package/dist/src/agent/memory-flush-controller.js.map +1 -1
- package/dist/src/agent/resume-classifier.js +18 -1
- package/dist/src/agent/resume-classifier.js.map +1 -1
- package/dist/src/agent/session-persistence.js +1 -1
- package/dist/src/agent/session-persistence.js.map +1 -1
- package/dist/src/agent/smoke-detector.js +3 -0
- package/dist/src/agent/smoke-detector.js.map +1 -1
- package/dist/src/agent/spawn/queue.js +10 -4
- package/dist/src/agent/spawn/queue.js.map +1 -1
- package/dist/src/agent/spawn/resume.js +6 -1
- package/dist/src/agent/spawn/resume.js.map +1 -1
- package/dist/src/agent/spawn-env.js +1 -1
- package/dist/src/agent/spawn-env.js.map +1 -1
- package/dist/src/agent/spawn.js +188 -28
- package/dist/src/agent/spawn.js.map +1 -1
- package/dist/src/browser/web-ai/grok-live.js +2 -0
- package/dist/src/browser/web-ai/grok-live.js.map +1 -1
- package/dist/src/cli/claude-models.js +2 -2
- package/dist/src/cli/claude-models.js.map +1 -1
- package/dist/src/cli/commands.js +3 -2
- package/dist/src/cli/commands.js.map +1 -1
- package/dist/src/cli/handlers-runtime.js +2 -0
- package/dist/src/cli/handlers-runtime.js.map +1 -1
- package/dist/src/cli/handlers-workflows.js +9 -4
- package/dist/src/cli/handlers-workflows.js.map +1 -1
- package/dist/src/cli/handlers.js +47 -7
- package/dist/src/cli/handlers.js.map +1 -1
- package/dist/src/cli/readiness.js +17 -1
- package/dist/src/cli/readiness.js.map +1 -1
- package/dist/src/cli/registry-live.js +17 -0
- package/dist/src/cli/registry-live.js.map +1 -0
- package/dist/src/cli/registry.js +44 -3
- package/dist/src/cli/registry.js.map +1 -1
- package/dist/src/cli/tui/composer.js +135 -5
- package/dist/src/cli/tui/composer.js.map +1 -1
- package/dist/src/cli/tui/diffview.js +41 -0
- package/dist/src/cli/tui/diffview.js.map +1 -0
- package/dist/src/cli/tui/editor.js +45 -0
- package/dist/src/cli/tui/editor.js.map +1 -0
- package/dist/src/cli/tui/file-mention.js +78 -0
- package/dist/src/cli/tui/file-mention.js.map +1 -0
- package/dist/src/cli/tui/highlight.js +82 -0
- package/dist/src/cli/tui/highlight.js.map +1 -0
- package/dist/src/cli/tui/keymap.js +21 -0
- package/dist/src/cli/tui/keymap.js.map +1 -1
- package/dist/src/cli/tui/markdown.js +124 -0
- package/dist/src/cli/tui/markdown.js.map +1 -0
- package/dist/src/cli/tui/mode.js +26 -0
- package/dist/src/cli/tui/mode.js.map +1 -0
- package/dist/src/cli/tui/overlay.js +121 -98
- package/dist/src/cli/tui/overlay.js.map +1 -1
- package/dist/src/cli/tui/render/frame.js +72 -0
- package/dist/src/cli/tui/render/frame.js.map +1 -0
- package/dist/src/cli/tui/render/layout.js +22 -0
- package/dist/src/cli/tui/render/layout.js.map +1 -0
- package/dist/src/cli/tui/render/mouse.js +25 -0
- package/dist/src/cli/tui/render/mouse.js.map +1 -0
- package/dist/src/cli/tui/render/scheduler.js +37 -0
- package/dist/src/cli/tui/render/scheduler.js.map +1 -0
- package/dist/src/cli/tui/render/viewport.js +82 -0
- package/dist/src/cli/tui/render/viewport.js.map +1 -0
- package/dist/src/cli/tui/renderers.js +37 -0
- package/dist/src/cli/tui/renderers.js.map +1 -1
- package/dist/src/cli/tui/stream.js +48 -0
- package/dist/src/cli/tui/stream.js.map +1 -0
- package/dist/src/cli/tui/text-buffer.js +143 -0
- package/dist/src/cli/tui/text-buffer.js.map +1 -0
- package/dist/src/cli/tui/theme.js +128 -0
- package/dist/src/cli/tui/theme.js.map +1 -0
- package/dist/src/cli/tui/transcript.js +4 -0
- package/dist/src/cli/tui/transcript.js.map +1 -1
- package/dist/src/command-contract/help-renderer.js +1 -1
- package/dist/src/command-contract/help-renderer.js.map +1 -1
- package/dist/src/core/cli-detection.js +14 -0
- package/dist/src/core/cli-detection.js.map +1 -1
- package/dist/src/core/config.js +5 -0
- package/dist/src/core/config.js.map +1 -1
- package/dist/src/core/db.js +7 -0
- package/dist/src/core/db.js.map +1 -1
- package/dist/src/core/employees.js +2 -2
- package/dist/src/core/employees.js.map +1 -1
- package/dist/src/discord/bot.js.map +1 -1
- package/dist/src/discord/discord-file.js +1 -1
- package/dist/src/discord/discord-file.js.map +1 -1
- package/dist/src/discord/send-only-client.js +1 -3
- package/dist/src/discord/send-only-client.js.map +1 -1
- package/dist/src/goal/heartbeat.js +30 -7
- package/dist/src/goal/heartbeat.js.map +1 -1
- package/dist/src/goal/store.js +6 -2
- package/dist/src/goal/store.js.map +1 -1
- package/dist/src/ide/diff.js +37 -0
- package/dist/src/ide/diff.js.map +1 -1
- package/dist/src/manager/launchd-service.js +1 -1
- package/dist/src/manager/launchd-service.js.map +1 -1
- package/dist/src/manager/lifecycle-helpers.js +14 -0
- package/dist/src/manager/lifecycle-helpers.js.map +1 -1
- package/dist/src/manager/lifecycle.js +49 -4
- package/dist/src/manager/lifecycle.js.map +1 -1
- package/dist/src/manager/notes/routes.js +0 -31
- package/dist/src/manager/notes/routes.js.map +1 -1
- package/dist/src/manager/notes/ws.js.map +1 -1
- package/dist/src/manager/registry.js.map +1 -1
- package/dist/src/manager/routes/dashboard-memory.js.map +1 -1
- package/dist/src/manager/scan.js +36 -1
- package/dist/src/manager/scan.js.map +1 -1
- package/dist/src/manager/server.js +21 -2
- package/dist/src/manager/server.js.map +1 -1
- package/dist/src/manager/systemd-service.js +1 -1
- package/dist/src/manager/systemd-service.js.map +1 -1
- package/dist/src/memory/keyword-expand.js +0 -187
- package/dist/src/memory/keyword-expand.js.map +1 -1
- package/dist/src/memory/runtime.js +2 -2
- package/dist/src/memory/runtime.js.map +1 -1
- package/dist/src/memory/shared.js.map +1 -1
- package/dist/src/orchestrator/collect.js +3 -2
- package/dist/src/orchestrator/collect.js.map +1 -1
- package/dist/src/orchestrator/distribute.js +7 -1
- package/dist/src/orchestrator/distribute.js.map +1 -1
- package/dist/src/orchestrator/friction.js +59 -0
- package/dist/src/orchestrator/friction.js.map +1 -0
- package/dist/src/orchestrator/pipeline.js +88 -45
- package/dist/src/orchestrator/pipeline.js.map +1 -1
- package/dist/src/orchestrator/sanitize.js +19 -0
- package/dist/src/orchestrator/sanitize.js.map +1 -0
- package/dist/src/orchestrator/seed.js +50 -0
- package/dist/src/orchestrator/seed.js.map +1 -0
- package/dist/src/orchestrator/state-machine.js +206 -74
- package/dist/src/orchestrator/state-machine.js.map +1 -1
- package/dist/src/orchestrator/worker-monitor.js +1 -1
- package/dist/src/orchestrator/worker-monitor.js.map +1 -1
- package/dist/src/orchestrator/worker-progress.js +29 -0
- package/dist/src/orchestrator/worker-progress.js.map +1 -0
- package/dist/src/orchestrator/worker-registry.js +63 -2
- package/dist/src/orchestrator/worker-registry.js.map +1 -1
- package/dist/src/prompt/builder.js +19 -29
- package/dist/src/prompt/builder.js.map +1 -1
- package/dist/src/prompt/templates/a1-system.md +40 -5
- package/dist/src/prompt/templates/control-system.md +2 -2
- package/dist/src/prompt/templates/employee.md +4 -1
- package/dist/src/prompt/templates/orchestration.md +23 -8
- package/dist/src/routes/employees.js +4 -4
- package/dist/src/routes/employees.js.map +1 -1
- package/dist/src/routes/goal.js +11 -3
- package/dist/src/routes/goal.js.map +1 -1
- package/dist/src/routes/heartbeat.js +1 -1
- package/dist/src/routes/heartbeat.js.map +1 -1
- package/dist/src/routes/i18n.js +1 -1
- package/dist/src/routes/i18n.js.map +1 -1
- package/dist/src/routes/jaw-memory.js +1 -1
- package/dist/src/routes/jaw-memory.js.map +1 -1
- package/dist/src/routes/memory.js.map +1 -1
- package/dist/src/routes/messaging.js.map +1 -1
- package/dist/src/routes/orchestrate.js +265 -116
- package/dist/src/routes/orchestrate.js.map +1 -1
- package/dist/src/routes/quota-agy-reverse.js +0 -5
- package/dist/src/routes/quota-agy-reverse.js.map +1 -1
- package/dist/src/routes/quota-kiro-reverse.js +187 -0
- package/dist/src/routes/quota-kiro-reverse.js.map +1 -0
- package/dist/src/routes/settings.js +31 -2
- package/dist/src/routes/settings.js.map +1 -1
- package/dist/src/routes/skills.js.map +1 -1
- package/dist/src/security/security-audit-log.js.map +1 -1
- package/dist/src/shared/shell-command-display.js +51 -0
- package/dist/src/shared/shell-command-display.js.map +1 -0
- package/dist/src/telegram/bot.js.map +1 -1
- package/dist/src/trace/store.js +32 -0
- package/dist/src/trace/store.js.map +1 -1
- package/dist/src/types/cli-engine.js +1 -0
- package/dist/src/types/cli-engine.js.map +1 -1
- package/dist/src/workflows/employee-boundary.js +7 -7
- package/dist/src/workflows/employee-boundary.js.map +1 -1
- package/dist/src/workflows/handoff.js +16 -16
- package/dist/src/workflows/handoff.js.map +1 -1
- package/dist/src/workflows/scope-sandbox.js +46 -0
- package/dist/src/workflows/scope-sandbox.js.map +1 -0
- package/package.json +1 -1
- package/public/assets/providers/kiro-color.svg +15 -0
- package/public/assets/providers/kiro.svg +14 -0
- package/public/css/modals.css +79 -0
- package/public/css/orc-state.css +21 -2
- package/public/css/sidebar.css +85 -0
- package/public/css/variables.css +2 -2
- package/public/dist/assets/{Agent-CIUGaUVn.js → Agent-DkH7eoHd.js} +1 -1
- package/public/dist/assets/{DocPanel-C1pGgE-S.js → DocPanel-BU16GUlB.js} +1 -1
- package/public/dist/assets/DocPanel-gU-WkgyA.css +1 -0
- package/public/dist/assets/Employees-F0ssNuO-.js +1 -0
- package/public/dist/assets/Heartbeat-C3JS6gkF.js +1 -0
- package/public/dist/assets/Mcp-_Yq4N3Sk.js +4 -0
- package/public/dist/assets/{Memory-BgN8djV4.js → Memory-C-EQubN2.js} +1 -1
- package/public/dist/assets/{ModelProvider-DHQ1Zvw0.js → ModelProvider-BD2KrypI.js} +1 -1
- package/public/dist/assets/agent-meta-B1098B_a.js +1 -0
- package/public/dist/assets/app-ByHYOMZE.js +48 -0
- package/public/dist/assets/app-CYdhP6Vh.css +1 -0
- package/public/dist/assets/constants-s2UJodER.js +1 -0
- package/public/dist/assets/{employees-DZSPGlaH.js → employees-_A-p_bZg.js} +7 -7
- package/public/dist/assets/idb-cache-0LNMskFB.js +1 -0
- package/public/dist/assets/idb-cache-5H89a4l8.js +1 -0
- package/public/dist/assets/{manager-DyrwJLZr.css → manager-B2qEQRxN.css} +1 -1
- package/public/dist/assets/manager-CR9BA-wO.js +12 -0
- package/public/dist/assets/memory-D1RKYvyu.js +1 -0
- package/public/dist/assets/{memory-B4RpXXJ7.js → memory-D9AUn8fG.js} +9 -9
- package/public/dist/assets/{provider-icons-XEfJPGTe.js → provider-icons-CVVK5xUP.js} +35 -6
- package/public/dist/assets/{render-DnylWKO1.js → render-DFBujF8n.js} +4 -4
- package/public/dist/assets/settings-B4ZkeaU-.js +1 -0
- package/public/dist/assets/settings-D9jTceN0.js +151 -0
- package/public/dist/assets/sidebar-DPPRNiTc.js +48 -0
- package/public/dist/assets/skills-8nHJkv-r.js +1 -0
- package/public/dist/assets/{skills-CW7NEhew.js → skills-BDVLIrVT.js} +6 -6
- package/public/dist/assets/{slash-commands-CAydTUgf.js → slash-commands-C5da3q1p.js} +1 -1
- package/public/dist/assets/slash-commands-RJWO8wJZ.js +1 -0
- package/public/dist/assets/{trace-drawer-G-KP3IbQ.js → trace-drawer-5kqBzFMk.js} +1 -1
- package/public/dist/assets/ui-Crnp79bG.js +142 -0
- package/public/dist/assets/ui-HtSKByR3.js +1 -0
- package/public/dist/index.html +113 -86
- package/public/dist/manager/index.html +2 -2
- package/public/index.html +111 -84
- package/public/js/constants.ts +30 -7
- package/public/js/features/chat-search.ts +5 -1
- package/public/js/features/employees.ts +7 -2
- package/public/js/features/idb-cache.ts +4 -0
- package/public/js/features/message-history.ts +55 -7
- package/public/js/features/pending-queue.ts +8 -2
- package/public/js/features/process-block.ts +32 -17
- package/public/js/features/process-log-adapter.ts +11 -2
- package/public/js/features/settings-cli-status-render.ts +163 -0
- package/public/js/features/settings-cli-status.ts +130 -185
- package/public/js/features/settings-core.ts +5 -1
- package/public/js/features/settings-mcp.ts +513 -7
- package/public/js/features/settings.ts +1 -1
- package/public/js/features/tool-ui.ts +18 -4
- package/public/js/features/transport-status-row.ts +3 -0
- package/public/js/main.ts +3 -0
- package/public/js/preview-parent-origin.ts +14 -0
- package/public/js/provider-icons.ts +6 -1
- package/public/js/render/file-links.ts +10 -2
- package/public/js/ui.ts +5 -2
- package/public/js/virtual-scroll.ts +19 -0
- package/public/js/ws.ts +163 -10
- package/public/locales/en.json +8 -2
- package/public/locales/ja.json +8 -2
- package/public/locales/ko.json +8 -2
- package/public/locales/zh.json +8 -2
- package/public/manager/src/App.tsx +13 -70
- package/public/manager/src/InstancePreview.tsx +36 -11
- package/public/manager/src/SidebarRailRouter.tsx +1 -1
- package/public/manager/src/doc-panel/DocPanel.tsx +14 -1
- package/public/manager/src/doc-panel/doc-panel.css +16 -0
- package/public/manager/src/hooks/useInstanceMessageEvents.ts +4 -15
- package/public/manager/src/manager-components.css +1 -1
- package/public/manager/src/manager-polish.css +1 -1
- package/public/manager/src/manager-shortcut-runner.ts +107 -0
- package/public/manager/src/manager-shortcuts.ts +15 -0
- package/public/manager/src/panels/desktop-bridge.ts +2 -0
- package/public/manager/src/settings/SettingsSidebar.tsx +1 -1
- package/public/manager/src/settings/components/sidebar-filter.ts +2 -0
- package/public/manager/src/settings/pages/Mcp.tsx +311 -43
- package/public/manager/src/settings/pages/components/McpServerCard.tsx +89 -55
- package/public/manager/src/settings/pages/components/agent/agent-meta.ts +29 -6
- package/public/manager/src/settings/pages/components/employees-helpers.ts +1 -0
- package/public/manager/src/settings/pages/components/heartbeat-helpers.ts +1 -0
- package/public/manager/src/settings/pages/mcp-helpers.ts +54 -12
- package/public/manager/src/settings/types.ts +1 -0
- package/public/manager/src/types.ts +2 -1
- package/scripts/fresh-install-smoke.ts +1 -1
- package/public/dist/assets/DocPanel-CL1scIfq.css +0 -1
- package/public/dist/assets/Employees-BL9MAzzx.js +0 -1
- package/public/dist/assets/Heartbeat-D64JCg4t.js +0 -1
- package/public/dist/assets/Mcp-wYwJA_61.js +0 -3
- package/public/dist/assets/agent-meta-BhEbjy4P.js +0 -1
- package/public/dist/assets/app-DLDdZ41k.js +0 -48
- package/public/dist/assets/app-RpnKs-sT.css +0 -1
- package/public/dist/assets/constants-ahKI_aEG.js +0 -1
- package/public/dist/assets/idb-cache-BnZfG5FD.js +0 -1
- package/public/dist/assets/idb-cache-CZ3JdK8r.js +0 -1
- package/public/dist/assets/manager-CfyZloIP.js +0 -12
- package/public/dist/assets/memory-C9EVOb_D.js +0 -1
- package/public/dist/assets/settings-DIG_i79X.js +0 -1
- package/public/dist/assets/settings-VCXKhhhz.js +0 -66
- package/public/dist/assets/sidebar-Bi_ktFVw.js +0 -18
- package/public/dist/assets/skills-RjRqvykb.js +0 -1
- package/public/dist/assets/slash-commands-DdXu96Zd.js +0 -1
- package/public/dist/assets/ui-CIQjTLzc.js +0 -1
- package/public/dist/assets/ui-CkHB9Jmo.js +0 -140
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../../../src/agent/spawn/queue.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../../../src/agent/spawn/queue.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ export function shouldEmitHeartbeat(lastVisibleTs, heartbeatSent, gateMs = DEFAU
|
|
|
10
10
|
return false;
|
|
11
11
|
return (now - lastVisibleTs) > gateMs;
|
|
12
12
|
}
|
|
13
|
-
export function shouldResumeBucketSession(cli, requestedModel, bucketModel, requestedResumeKey, bucketResumeKey, bucketUpdatedAt, nowMs = Date.now()) {
|
|
13
|
+
export function shouldResumeBucketSession(cli, requestedModel, bucketModel, requestedResumeKey, bucketResumeKey, bucketUpdatedAt, nowMs = Date.now(), effectiveProvider) {
|
|
14
14
|
if (cli === 'gemini') {
|
|
15
15
|
if (!bucketModel)
|
|
16
16
|
return false;
|
|
@@ -30,6 +30,11 @@ export function shouldResumeBucketSession(cli, requestedModel, bucketModel, requ
|
|
|
30
30
|
return false;
|
|
31
31
|
return normalizeModelForCli(cli, requestedModel) === normalizeModelForCli(cli, bucketModel);
|
|
32
32
|
}
|
|
33
|
+
if (cli === 'kiro-code' || (cli === 'ai-e' && effectiveProvider === 'kiro')) {
|
|
34
|
+
if (!bucketModel)
|
|
35
|
+
return false;
|
|
36
|
+
return normalizeModelForCli('kiro-code', requestedModel) === normalizeModelForCli('kiro-code', bucketModel);
|
|
37
|
+
}
|
|
33
38
|
if (cli === 'opencode' && requestedResumeKey) {
|
|
34
39
|
return requestedResumeKey === (bucketResumeKey ?? null);
|
|
35
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resume.js","sourceRoot":"","sources":["../../../../src/agent/spawn/resume.ts"],"names":[],"mappings":"AAAA,sFAAsF;AAEtF,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,wDAAwD;AACxD,kDAAkD;AAClD,iEAAiE;AACjE,yDAAyD;AACzD,MAAM,yBAAyB,GAAG,MAAM,CAAC;AAEzC,MAAM,UAAU,mBAAmB,CAC/B,aAAqB,EACrB,aAAsB,EACtB,SAAiB,yBAAyB,EAC1C,MAAc,IAAI,CAAC,GAAG,EAAE;IAExB,IAAI,aAAa;QAAE,OAAO,KAAK,CAAC;IAChC,OAAO,CAAC,GAAG,GAAG,aAAa,CAAC,GAAG,MAAM,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,yBAAyB,CACrC,GAAW,EACX,cAAsB,EACtB,WAAsC,EACtC,kBAAkC,EAClC,eAA+B,EAC/B,eAAwC,EACxC,QAAgB,IAAI,CAAC,GAAG,EAAE;
|
|
1
|
+
{"version":3,"file":"resume.js","sourceRoot":"","sources":["../../../../src/agent/spawn/resume.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,7 +62,7 @@ export function applyCliEnvDefaults(cli, extraEnv = {}, inheritedEnv = process.e
|
|
|
62
62
|
}
|
|
63
63
|
return merged;
|
|
64
64
|
}
|
|
65
|
-
if (cli === 'agy') {
|
|
65
|
+
if (cli === 'agy' || cli === 'kiro-code') {
|
|
66
66
|
return {
|
|
67
67
|
...extraEnv,
|
|
68
68
|
NO_COLOR: extraEnv["NO_COLOR"] ?? inheritedEnv["NO_COLOR"] ?? '1',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spawn-env.js","sourceRoot":"","sources":["../../../src/agent/spawn-env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAErC,MAAM,sBAAsB,GAAG,iCAAiC,CAAC;AACjE,MAAM,0BAA0B,GAAG;IAC/B,GAAG;IACH,MAAM;IACN,YAAY;IACZ,WAAW;IACX,MAAM;IACN,oBAAoB;IACpB,MAAM;IACN,MAAM;IACN,MAAM;IACN,KAAK;IACL,UAAU;IACV,MAAM;IACN,OAAO;IACP,MAAM;IACN,UAAU;IACV,WAAW;IACX,UAAU;IACV,WAAW;CACL,CAAC;AACX,MAAM,0BAA0B,GAAG,4BAA4B,CAAC;AAChE,MAAM,0BAA0B,GAAG,iCAAiC,CAAC;AAErE,MAAM,sBAAsB,GAA4B;IACpD,OAAO,EAAE;QACL,WAAW,EAAE,CAAC;QACd,gBAAgB,EAAE,IAAI;KACzB;CACJ,CAAC;AACF,IAAI,yBAAyB,GAAkB,IAAI,CAAC;AAEpD,SAAS,2BAA2B;IAChC,IAAI,yBAAyB,IAAI,EAAE,CAAC,UAAU,CAAC,yBAAyB,CAAC,EAAE,CAAC;QACxE,OAAO,yBAAyB,CAAC;IACrC,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,iCAAiC,CAAC,CAAC;IACrE,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,sBAAsB,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAClF,yBAAyB,GAAG,OAAO,CAAC;IACpC,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,SAAS,cAAc,CACnB,QAAgC,EAChC,YAA+B,EAC/B,GAAW;IAEX,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACnE,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC;IAClF,OAAO;QACH,GAAG,QAAQ;QACX,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;KAClC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,0BAA0B;IACtC,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,mBAAmB,CAC/B,GAAW,EACX,WAAmC,EAAE,EACrC,eAAkC,OAAO,CAAC,GAAG;IAE7C,IAAI,GAAG,KAAK,QAAQ,EAAE,CAAC;QACnB,MAAM,MAAM,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;QAC/B,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,IAAI,CAAC,YAAY,CAAC,0BAA0B,CAAC,EAAE,CAAC;YACnF,MAAM,CAAC,0BAA0B,CAAC,GAAG,MAAM,CAAC;QAChD,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,EAAE,CAAC;YACtC,MAAM,CAAC,0BAA0B,CAAC,GAAG,2BAA2B,EAAE,CAAC;QACvE,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,IAAI,GAAG,KAAK,KAAK,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"spawn-env.js","sourceRoot":"","sources":["../../../src/agent/spawn-env.ts"],"names":[],"mappings":"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"}
|
package/dist/src/agent/spawn.js
CHANGED
|
@@ -19,6 +19,7 @@ import { getSessionOwnershipGeneration, persistMainSession, } from './session-pe
|
|
|
19
19
|
import { isCompactMarkerRow } from '../core/compact.js';
|
|
20
20
|
import { isRuntimeSettingsMutationInFlight, waitForRuntimeSettingsIdle } from '../core/runtime-settings-gate.js';
|
|
21
21
|
import { hasBlockingWorkers, hasPendingWorkerReplays, getActiveWorkers, clearAllWorkers } from '../orchestrator/worker-registry.js';
|
|
22
|
+
import { sanitizeWorkerProgressTools } from '../orchestrator/worker-progress.js';
|
|
22
23
|
import { handleAgentExit, setSpawnAgent, setMainMetaHandler } from './lifecycle-handler.js';
|
|
23
24
|
import { buildServicePath } from '../core/runtime-path.js';
|
|
24
25
|
import { resolveOrcScope } from '../orchestrator/scope.js';
|
|
@@ -31,6 +32,9 @@ import { asCliEventRecord, discriminate, fieldString } from '../types/cli-events
|
|
|
31
32
|
import { isJawRuntimeEvent, handleJawRuntimeEvent } from './claude-e-runtime.js';
|
|
32
33
|
import { appendTraceEvent, stampTraceTool, startTraceRun } from '../trace/store.js';
|
|
33
34
|
import { extractAgyConversationId, formatAgyTimeoutMessage, isAgyStaleSessionOutput, isAgyTimeoutOutput } from './agy-runtime.js';
|
|
35
|
+
import { appendAssistantTextSegment } from './events/helpers.js';
|
|
36
|
+
import { listKiroConversationIdsForCwd } from './kiro-auth.js';
|
|
37
|
+
import { captureKiroSessionIdAfterExit, finalizeKiroFullText, flushKiroStdoutContext, isKiroPlainTextCli, isKiroStaleSessionOutput, processKiroStdoutChunk, } from './kiro-runtime.js';
|
|
34
38
|
import { resolveCursorModelVariant } from './cursor-runtime.js';
|
|
35
39
|
// ─── State ───────────────────────────────────────────
|
|
36
40
|
export let activeProcess = null;
|
|
@@ -62,6 +66,73 @@ export function buildAiERuntimeStatusMeta(cli, provider, model) {
|
|
|
62
66
|
};
|
|
63
67
|
}
|
|
64
68
|
import { killProcessTree } from './spawn/process-kill.js';
|
|
69
|
+
function appendParentLiveRunTool(ctx, tool) {
|
|
70
|
+
if (!ctx.parentLiveScope)
|
|
71
|
+
return;
|
|
72
|
+
const [safeTool] = sanitizeWorkerProgressTools([{ ...tool, isEmployee: true }]);
|
|
73
|
+
if (!safeTool)
|
|
74
|
+
return;
|
|
75
|
+
appendLiveRunTool(ctx.parentLiveScope, { ...safeTool, isEmployee: true });
|
|
76
|
+
}
|
|
77
|
+
function emitKiroStreamEvents(events, ctx, agentLabel, cli, empTag, traceAudience) {
|
|
78
|
+
for (const event of events) {
|
|
79
|
+
ctx.kiroLastVisibleAt = Date.now();
|
|
80
|
+
ctx.kiroHeartbeatSent = false;
|
|
81
|
+
ctx.stallWatchdog?.markProgress();
|
|
82
|
+
if (event.kind === 'assistant_delta') {
|
|
83
|
+
const segment = event.text;
|
|
84
|
+
if (!segment)
|
|
85
|
+
continue;
|
|
86
|
+
if (ctx.liveOutputText !== undefined) {
|
|
87
|
+
ctx.liveOutputText += segment;
|
|
88
|
+
}
|
|
89
|
+
ctx.outputTextStarted = true;
|
|
90
|
+
if (ctx.liveScope)
|
|
91
|
+
appendLiveRunText(ctx.liveScope, segment);
|
|
92
|
+
broadcast('agent_output', {
|
|
93
|
+
agentId: agentLabel,
|
|
94
|
+
cli,
|
|
95
|
+
text: segment,
|
|
96
|
+
...empTag,
|
|
97
|
+
}, traceAudience);
|
|
98
|
+
continue;
|
|
99
|
+
}
|
|
100
|
+
const tool = {
|
|
101
|
+
icon: event.icon,
|
|
102
|
+
label: event.label,
|
|
103
|
+
detail: event.detail || '',
|
|
104
|
+
stepRef: event.stepRef,
|
|
105
|
+
status: event.status,
|
|
106
|
+
toolType: 'tool',
|
|
107
|
+
};
|
|
108
|
+
stampTraceTool(tool, ctx, 'tool');
|
|
109
|
+
const existingIdx = ctx.toolLog.findIndex((entry) => entry.stepRef === event.stepRef);
|
|
110
|
+
if (existingIdx >= 0) {
|
|
111
|
+
ctx.toolLog[existingIdx] = { ...ctx.toolLog[existingIdx], ...tool };
|
|
112
|
+
}
|
|
113
|
+
else {
|
|
114
|
+
ctx.toolLog.push(tool);
|
|
115
|
+
}
|
|
116
|
+
if (ctx.liveScope)
|
|
117
|
+
replaceLiveRunTools(ctx.liveScope, ctx.toolLog);
|
|
118
|
+
appendParentLiveRunTool(ctx, tool);
|
|
119
|
+
broadcast('agent_tool', { agentId: agentLabel, ...tool, ...empTag }, traceAudience);
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
function maybeEmitKiroWorkingHeartbeat(ctx, agentLabel, empTag, traceAudience) {
|
|
123
|
+
const lastVisible = ctx.kiroLastVisibleAt ?? Date.now();
|
|
124
|
+
if (!shouldEmitHeartbeat(lastVisible, ctx.kiroHeartbeatSent === true))
|
|
125
|
+
return;
|
|
126
|
+
ctx.kiroHeartbeatSent = true;
|
|
127
|
+
broadcast('agent_tool', {
|
|
128
|
+
agentId: agentLabel,
|
|
129
|
+
icon: '⏳',
|
|
130
|
+
label: 'Kiro working...',
|
|
131
|
+
toolType: 'tool',
|
|
132
|
+
status: 'running',
|
|
133
|
+
...empTag,
|
|
134
|
+
}, traceAudience);
|
|
135
|
+
}
|
|
65
136
|
export function killAgentById(agentId) {
|
|
66
137
|
const proc = activeProcesses.get(agentId);
|
|
67
138
|
if (!proc)
|
|
@@ -116,6 +187,9 @@ export function setSteerInProgress(v) {
|
|
|
116
187
|
if (was && !v)
|
|
117
188
|
queueMicrotask(() => processQueue());
|
|
118
189
|
}
|
|
190
|
+
export function isSteerInProgress() {
|
|
191
|
+
return steerInProgress;
|
|
192
|
+
}
|
|
119
193
|
export function isAgentBusy() {
|
|
120
194
|
return !!activeProcess || queueCtrl.isRetryPending() || mainSpawnStarting || steerInProgress;
|
|
121
195
|
}
|
|
@@ -557,8 +631,8 @@ export function spawnAgent(prompt, opts = {}) {
|
|
|
557
631
|
const bucketResumeKey = typeof bucketRow?.resume_key === 'string' ? bucketRow.resume_key : null;
|
|
558
632
|
const bucketUpdatedAt = bucketRow?.updated_at ?? null;
|
|
559
633
|
const resumeKey = buildSessionResumeKey(cli, spawnEnv);
|
|
560
|
-
const providerSupportsResume = !(cli === 'ai-e' && effectiveProvider !== 'claude');
|
|
561
|
-
const canResumeBucketSession = !bucketSessionId || shouldResumeBucketSession(cli, runtimeModel, bucketModel, resumeKey, bucketResumeKey, bucketUpdatedAt);
|
|
634
|
+
const providerSupportsResume = !(cli === 'ai-e' && effectiveProvider !== 'claude' && effectiveProvider !== 'kiro');
|
|
635
|
+
const canResumeBucketSession = !bucketSessionId || shouldResumeBucketSession(cli, runtimeModel, bucketModel, resumeKey, bucketResumeKey, bucketUpdatedAt, Date.now(), effectiveProvider);
|
|
562
636
|
const isResume = empSid
|
|
563
637
|
? true
|
|
564
638
|
: (providerSupportsResume && !opts._skipResume && !forceNew && !!bucketSessionId && canResumeBucketSession);
|
|
@@ -608,10 +682,10 @@ export function spawnAgent(prompt, opts = {}) {
|
|
|
608
682
|
const historyBlock = !isResume && !opts._skipHistory
|
|
609
683
|
? buildHistoryBlock(prompt, settings["workingDir"], cli === 'gemini' ? GEMINI_HISTORY_MAX_SESSIONS : 10, cli === 'gemini' ? GEMINI_HISTORY_MAX_CHARS : 8000)
|
|
610
684
|
: '';
|
|
611
|
-
let promptForArgs = (cli === 'agy' || cli === 'cursor' || cli === 'gemini' || cli === 'grok' || cli === 'opencode' || (cli === 'ai-e' && effectiveProvider !== 'claude'))
|
|
685
|
+
let promptForArgs = (cli === 'agy' || cli === 'cursor' || cli === 'kiro-code' || cli === 'gemini' || cli === 'grok' || cli === 'opencode' || (cli === 'ai-e' && effectiveProvider !== 'claude'))
|
|
612
686
|
? withHistoryPrompt(prompt, historyBlock)
|
|
613
687
|
: prompt;
|
|
614
|
-
if (cli === 'agy' && sysPrompt) {
|
|
688
|
+
if ((cli === 'agy' || cli === 'kiro-code' || (cli === 'ai-e' && effectiveProvider === 'kiro')) && sysPrompt) {
|
|
615
689
|
promptForArgs = `[Operational Context — cli-jaw Integration]\nThe following operational guidelines apply to this session. Follow these task rules and use the tools/commands described:\n\n${sysPrompt}\n\n---\n\n${promptForArgs}`;
|
|
616
690
|
}
|
|
617
691
|
const claudeBin = (cli === 'claude-e' || (cli === 'ai-e' && effectiveProvider === 'claude'))
|
|
@@ -811,8 +885,7 @@ export function spawnAgent(prompt, opts = {}) {
|
|
|
811
885
|
ctx.toolLog.push(tool);
|
|
812
886
|
if (ctx.liveScope)
|
|
813
887
|
replaceLiveRunTools(ctx.liveScope, ctx.toolLog);
|
|
814
|
-
|
|
815
|
-
appendLiveRunTool(ctx.parentLiveScope, { ...tool, isEmployee: true });
|
|
888
|
+
appendParentLiveRunTool(ctx, tool);
|
|
816
889
|
broadcast('agent_tool', { agentId: agentLabel, ...tool, ...empTag }, traceAudience);
|
|
817
890
|
}
|
|
818
891
|
ctx.thinkingBuf = '';
|
|
@@ -846,8 +919,7 @@ export function spawnAgent(prompt, opts = {}) {
|
|
|
846
919
|
ctx.toolLog.push(parsedTool);
|
|
847
920
|
if (ctx.liveScope)
|
|
848
921
|
replaceLiveRunTools(ctx.liveScope, ctx.toolLog);
|
|
849
|
-
|
|
850
|
-
appendLiveRunTool(ctx.parentLiveScope, { ...parsedTool, isEmployee: true });
|
|
922
|
+
appendParentLiveRunTool(ctx, parsedTool);
|
|
851
923
|
broadcast('agent_tool', { agentId: agentLabel, ...parsedTool, ...empTag }, traceAudience);
|
|
852
924
|
// Reset heartbeat gate on actually visible broadcast (not 💭)
|
|
853
925
|
lastVisibleBroadcastTs = Date.now();
|
|
@@ -856,10 +928,19 @@ export function spawnAgent(prompt, opts = {}) {
|
|
|
856
928
|
}
|
|
857
929
|
if (parsed.text) {
|
|
858
930
|
flushThinking();
|
|
859
|
-
ctx
|
|
860
|
-
if (
|
|
861
|
-
|
|
862
|
-
|
|
931
|
+
const segment = appendAssistantTextSegment(ctx, parsed.text);
|
|
932
|
+
if (segment) {
|
|
933
|
+
if (ctx.liveScope)
|
|
934
|
+
appendLiveRunText(ctx.liveScope, segment);
|
|
935
|
+
broadcast('agent_output', {
|
|
936
|
+
agentId: agentLabel,
|
|
937
|
+
cli,
|
|
938
|
+
text: segment,
|
|
939
|
+
...empTag,
|
|
940
|
+
}, traceAudience);
|
|
941
|
+
lastVisibleBroadcastTs = Date.now();
|
|
942
|
+
heartbeatSent = false;
|
|
943
|
+
}
|
|
863
944
|
}
|
|
864
945
|
opts.lifecycle?.onActivity?.('acp');
|
|
865
946
|
});
|
|
@@ -874,8 +955,7 @@ export function spawnAgent(prompt, opts = {}) {
|
|
|
874
955
|
ctx.toolLog.push(parsed.tool);
|
|
875
956
|
if (ctx.liveScope)
|
|
876
957
|
replaceLiveRunTools(ctx.liveScope, ctx.toolLog);
|
|
877
|
-
|
|
878
|
-
appendLiveRunTool(ctx.parentLiveScope, { ...parsed.tool, isEmployee: true });
|
|
958
|
+
appendParentLiveRunTool(ctx, parsed.tool);
|
|
879
959
|
broadcast('agent_tool', { agentId: agentLabel, ...parsed.tool, ...empTag }, traceAudience);
|
|
880
960
|
}
|
|
881
961
|
});
|
|
@@ -890,8 +970,7 @@ export function spawnAgent(prompt, opts = {}) {
|
|
|
890
970
|
ctx.toolLog.push(parsed.tool);
|
|
891
971
|
if (ctx.liveScope)
|
|
892
972
|
replaceLiveRunTools(ctx.liveScope, ctx.toolLog);
|
|
893
|
-
|
|
894
|
-
appendLiveRunTool(ctx.parentLiveScope, { ...parsed.tool, isEmployee: true });
|
|
973
|
+
appendParentLiveRunTool(ctx, parsed.tool);
|
|
895
974
|
broadcast('agent_tool', { agentId: agentLabel, ...parsed.tool, ...empTag }, traceAudience);
|
|
896
975
|
}
|
|
897
976
|
});
|
|
@@ -1103,8 +1182,7 @@ export function spawnAgent(prompt, opts = {}) {
|
|
|
1103
1182
|
ctx.toolLog.push(tool);
|
|
1104
1183
|
if (ctx.liveScope)
|
|
1105
1184
|
replaceLiveRunTools(ctx.liveScope, ctx.toolLog);
|
|
1106
|
-
|
|
1107
|
-
appendLiveRunTool(ctx.parentLiveScope, { ...tool, isEmployee: true });
|
|
1185
|
+
appendParentLiveRunTool(ctx, tool);
|
|
1108
1186
|
broadcast('agent_tool', { agentId: agentLabel, ...tool, ...empTag }, traceAudience);
|
|
1109
1187
|
}
|
|
1110
1188
|
ctx.thinkingBuf = '';
|
|
@@ -1136,8 +1214,7 @@ export function spawnAgent(prompt, opts = {}) {
|
|
|
1136
1214
|
ctx.toolLog.push(parsedTool);
|
|
1137
1215
|
if (ctx.liveScope)
|
|
1138
1216
|
replaceLiveRunTools(ctx.liveScope, ctx.toolLog);
|
|
1139
|
-
|
|
1140
|
-
appendLiveRunTool(ctx.parentLiveScope, { ...parsedTool, isEmployee: true });
|
|
1217
|
+
appendParentLiveRunTool(ctx, parsedTool);
|
|
1141
1218
|
broadcast('agent_tool', { agentId: agentLabel, ...parsedTool, ...empTag }, traceAudience);
|
|
1142
1219
|
lastVisibleBroadcastTs = Date.now();
|
|
1143
1220
|
heartbeatSent = false;
|
|
@@ -1145,9 +1222,19 @@ export function spawnAgent(prompt, opts = {}) {
|
|
|
1145
1222
|
}
|
|
1146
1223
|
if (parsed.text) {
|
|
1147
1224
|
flushCodexAppThinking();
|
|
1148
|
-
ctx
|
|
1149
|
-
if (
|
|
1150
|
-
|
|
1225
|
+
const segment = appendAssistantTextSegment(ctx, parsed.text);
|
|
1226
|
+
if (segment) {
|
|
1227
|
+
if (ctx.liveScope)
|
|
1228
|
+
appendLiveRunText(ctx.liveScope, segment);
|
|
1229
|
+
broadcast('agent_output', {
|
|
1230
|
+
agentId: agentLabel,
|
|
1231
|
+
cli,
|
|
1232
|
+
text: segment,
|
|
1233
|
+
...empTag,
|
|
1234
|
+
}, traceAudience);
|
|
1235
|
+
lastVisibleBroadcastTs = Date.now();
|
|
1236
|
+
heartbeatSent = false;
|
|
1237
|
+
}
|
|
1151
1238
|
}
|
|
1152
1239
|
if (parsed.sessionId && !ctx.sessionId) {
|
|
1153
1240
|
ctx.sessionId = parsed.sessionId;
|
|
@@ -1383,6 +1470,11 @@ export function spawnAgent(prompt, opts = {}) {
|
|
|
1383
1470
|
if (!opts.internal)
|
|
1384
1471
|
broadcast('agent_status', { status: 'running', cli, agentId: agentLabel, ...runtimeStatusMeta, ...empTag }, traceAudience);
|
|
1385
1472
|
const traceRunId = startTraceRun({ cli, model: runtimeModel, workingDir: settings["workingDir"] || null, agentLabel, audience: traceAudience });
|
|
1473
|
+
const kiroPlainText = isKiroPlainTextCli(cli, effectiveProvider);
|
|
1474
|
+
const kiroSpawnStartedAt = kiroPlainText ? Date.now() - 1000 : 0;
|
|
1475
|
+
const kiroConversationIdsBefore = (kiroPlainText && !isResume && !empSid)
|
|
1476
|
+
? listKiroConversationIdsForCwd(spawnCwd)
|
|
1477
|
+
: null;
|
|
1386
1478
|
const agyResumeOffset = cli === 'agy' && isResume
|
|
1387
1479
|
? (empSid ? (opts.employeeOutputLen ?? 0) : (bucketRow?.output_len ?? 0))
|
|
1388
1480
|
: 0;
|
|
@@ -1392,7 +1484,7 @@ export function spawnAgent(prompt, opts = {}) {
|
|
|
1392
1484
|
toolLog: [],
|
|
1393
1485
|
seenToolKeys: new Set(),
|
|
1394
1486
|
hasClaudeStreamEvents: false,
|
|
1395
|
-
sessionId: null,
|
|
1487
|
+
sessionId: (kiroPlainText && isResume && resumeSessionId) ? resumeSessionId : null,
|
|
1396
1488
|
cost: null,
|
|
1397
1489
|
turns: null,
|
|
1398
1490
|
duration: null,
|
|
@@ -1409,6 +1501,8 @@ export function spawnAgent(prompt, opts = {}) {
|
|
|
1409
1501
|
geminiResultSeen: false,
|
|
1410
1502
|
...(opencodeSpawnAudit ? { opencodeSpawnAudit: opencodeSpawnAudit } : {}),
|
|
1411
1503
|
...(agyResumeOffset > 0 ? { agyResumeOffset, agyBytesReceived: 0 } : {}),
|
|
1504
|
+
...(kiroPlainText || cli === 'agy' ? { liveOutputText: '' } : {}),
|
|
1505
|
+
...(kiroPlainText ? { kiroLastVisibleAt: Date.now(), kiroHeartbeatSent: false } : {}),
|
|
1412
1506
|
};
|
|
1413
1507
|
let geminiWatchdog = null;
|
|
1414
1508
|
// ─── Subprocess stall watchdog (Phase 1: #178 OAuth2 stall recovery) ───
|
|
@@ -1534,6 +1628,7 @@ export function spawnAgent(prompt, opts = {}) {
|
|
|
1534
1628
|
}, 30_000);
|
|
1535
1629
|
}
|
|
1536
1630
|
const agyUtf8 = cli === 'agy' ? new StringDecoder('utf8') : null;
|
|
1631
|
+
const kiroUtf8 = kiroPlainText ? new StringDecoder('utf8') : null;
|
|
1537
1632
|
child.stdout.on('data', (chunk) => {
|
|
1538
1633
|
opts.lifecycle?.onActivity?.('stdout');
|
|
1539
1634
|
lastOpencodeIoAt = Date.now();
|
|
@@ -1557,26 +1652,46 @@ export function spawnAgent(prompt, opts = {}) {
|
|
|
1557
1652
|
ctx.agyResumeOffset = 0;
|
|
1558
1653
|
if (!newText)
|
|
1559
1654
|
return;
|
|
1655
|
+
const segment = appendAssistantTextSegment(ctx, newText);
|
|
1656
|
+
if (!segment)
|
|
1657
|
+
return;
|
|
1560
1658
|
if (ctx.liveScope)
|
|
1561
|
-
appendLiveRunText(ctx.liveScope,
|
|
1659
|
+
appendLiveRunText(ctx.liveScope, segment);
|
|
1562
1660
|
broadcast('agent_output', {
|
|
1563
1661
|
agentId: agentLabel,
|
|
1564
1662
|
cli,
|
|
1565
|
-
text:
|
|
1663
|
+
text: segment,
|
|
1566
1664
|
...empTag,
|
|
1567
1665
|
}, traceAudience);
|
|
1568
1666
|
return;
|
|
1569
1667
|
}
|
|
1668
|
+
const segment = appendAssistantTextSegment(ctx, text);
|
|
1669
|
+
if (!segment)
|
|
1670
|
+
return;
|
|
1570
1671
|
if (ctx.liveScope)
|
|
1571
|
-
appendLiveRunText(ctx.liveScope,
|
|
1672
|
+
appendLiveRunText(ctx.liveScope, segment);
|
|
1572
1673
|
broadcast('agent_output', {
|
|
1573
1674
|
agentId: agentLabel,
|
|
1574
1675
|
cli,
|
|
1575
|
-
text,
|
|
1676
|
+
text: segment,
|
|
1576
1677
|
...empTag,
|
|
1577
1678
|
}, traceAudience);
|
|
1578
1679
|
return;
|
|
1579
1680
|
}
|
|
1681
|
+
if (kiroPlainText) {
|
|
1682
|
+
const text = kiroUtf8.write(chunk);
|
|
1683
|
+
if (!text)
|
|
1684
|
+
return;
|
|
1685
|
+
appendTraceEvent({ runId: ctx.traceRunId, source: 'cli_raw', eventType: 'plain_text', raw: text });
|
|
1686
|
+
const events = processKiroStdoutChunk(ctx, text);
|
|
1687
|
+
if (events.length) {
|
|
1688
|
+
emitKiroStreamEvents(events, ctx, agentLabel, cli, empTag, traceAudience);
|
|
1689
|
+
}
|
|
1690
|
+
else {
|
|
1691
|
+
maybeEmitKiroWorkingHeartbeat(ctx, agentLabel, empTag, traceAudience);
|
|
1692
|
+
}
|
|
1693
|
+
return;
|
|
1694
|
+
}
|
|
1580
1695
|
buffer += chunk.toString();
|
|
1581
1696
|
const lines = buffer.split('\n');
|
|
1582
1697
|
buffer = lines.pop() ?? '';
|
|
@@ -1616,6 +1731,13 @@ export function spawnAgent(prompt, opts = {}) {
|
|
|
1616
1731
|
if (remaining)
|
|
1617
1732
|
ctx.fullText += remaining;
|
|
1618
1733
|
}
|
|
1734
|
+
if (kiroUtf8) {
|
|
1735
|
+
const remaining = kiroUtf8.end();
|
|
1736
|
+
if (remaining) {
|
|
1737
|
+
emitKiroStreamEvents(processKiroStdoutChunk(ctx, remaining), ctx, agentLabel, cli, empTag, traceAudience);
|
|
1738
|
+
}
|
|
1739
|
+
emitKiroStreamEvents(flushKiroStdoutContext(ctx), ctx, agentLabel, cli, empTag, traceAudience);
|
|
1740
|
+
}
|
|
1619
1741
|
const agyTotalOutputLen = cli === 'agy' ? ctx.fullText.length : 0;
|
|
1620
1742
|
if (cli === 'agy' && agyResumeOffset > 0) {
|
|
1621
1743
|
ctx.fullText = ctx.fullText.slice(Math.min(agyResumeOffset, ctx.fullText.length));
|
|
@@ -1656,6 +1778,44 @@ export function spawnAgent(prompt, opts = {}) {
|
|
|
1656
1778
|
}
|
|
1657
1779
|
ctx.sessionId = null;
|
|
1658
1780
|
}
|
|
1781
|
+
if (kiroPlainText) {
|
|
1782
|
+
const captured = captureKiroSessionIdAfterExit({
|
|
1783
|
+
cwd: spawnCwd,
|
|
1784
|
+
spawnStartedAt: kiroSpawnStartedAt,
|
|
1785
|
+
beforeIds: kiroConversationIdsBefore,
|
|
1786
|
+
stdout: ctx.fullText,
|
|
1787
|
+
stderr: ctx.stderrBuf,
|
|
1788
|
+
resumeSessionId,
|
|
1789
|
+
isResume,
|
|
1790
|
+
});
|
|
1791
|
+
ctx.sessionId = captured.id;
|
|
1792
|
+
if (captured.source) {
|
|
1793
|
+
console.log(`[jaw:kiro] session capture source=${captured.source} id=${captured.id?.slice(0, 12) ?? 'none'}...`);
|
|
1794
|
+
}
|
|
1795
|
+
if (!ctx.sessionId) {
|
|
1796
|
+
console.warn(`[jaw:kiro] session id capture failed cwd=${spawnCwd}`);
|
|
1797
|
+
}
|
|
1798
|
+
if (isResume && isKiroStaleSessionOutput(ctx.fullText)) {
|
|
1799
|
+
console.log('[jaw:kiro] stale session detected in output — clearing bucket');
|
|
1800
|
+
try {
|
|
1801
|
+
const bucket = resolveSessionBucket(cli, runtimeModel, effectiveProvider);
|
|
1802
|
+
clearSessionBucket.run(bucket);
|
|
1803
|
+
}
|
|
1804
|
+
catch (e) {
|
|
1805
|
+
console.warn('[jaw:kiro] stale bucket clear failed:', e.message);
|
|
1806
|
+
}
|
|
1807
|
+
ctx.sessionId = null;
|
|
1808
|
+
}
|
|
1809
|
+
const parsed = finalizeKiroFullText(ctx.fullText, ctx.kiroLineBuffer);
|
|
1810
|
+
const best = [ctx.liveOutputText, ctx.kiroDisplayedText, parsed]
|
|
1811
|
+
.map((value) => String(value || '').trim())
|
|
1812
|
+
.filter(Boolean)
|
|
1813
|
+
.sort((a, b) => b.length - a.length)[0];
|
|
1814
|
+
if (best)
|
|
1815
|
+
ctx.fullText = best;
|
|
1816
|
+
else if (parsed)
|
|
1817
|
+
ctx.fullText = parsed;
|
|
1818
|
+
}
|
|
1659
1819
|
const agyTimedOut = cli === 'agy' && isAgyTimeoutOutput(ctx.fullText);
|
|
1660
1820
|
const effectiveExitCode = agyTimedOut ? 124 : code;
|
|
1661
1821
|
if (agyTimedOut) {
|