mixdog 1.4.3 → 1.4.5
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/package.json +1 -2
- package/src/cli.mjs +5 -1
- package/src/defaults/shipped-history.json +30 -2
- package/src/defaults/skills/browser-use/SKILL.md +148 -273
- package/src/defaults/skills/browser-use/references/devtools.md +14 -0
- package/src/defaults/skills/browser-use/references/page-flows.md +66 -0
- package/src/defaults/skills/browser-use/references/sign-in.md +70 -0
- package/src/defaults/skills/code-tidy/SKILL.md +60 -84
- package/src/defaults/skills/code-tidy/references/agent-cleanup.md +27 -2
- package/src/defaults/skills/computer-use/SKILL.md +145 -229
- package/src/defaults/skills/computer-use/references/flows.md +35 -0
- package/src/defaults/skills/computer-use/references/operations.md +22 -0
- package/src/defaults/skills/computer-use/references/platforms.md +12 -0
- package/src/defaults/skills/docx/SKILL.md +23 -31
- package/src/defaults/skills/docx/references/native-authoring.md +26 -3
- package/src/defaults/skills/docx/references/redlining.md +15 -0
- package/src/defaults/skills/image/SKILL.md +37 -77
- package/src/defaults/skills/image/references/prompt-forms.md +51 -0
- package/src/defaults/skills/image/references/text.md +6 -0
- package/src/defaults/skills/local-provider/SKILL.md +75 -105
- package/src/defaults/skills/local-provider/references/lifecycle.md +14 -0
- package/src/defaults/skills/local-provider/references/maintenance.md +19 -0
- package/src/defaults/skills/local-provider/references/recovery.md +30 -0
- package/src/defaults/skills/memory-management/SKILL.md +22 -21
- package/src/defaults/skills/pdf/SKILL.md +21 -23
- package/src/defaults/skills/pdf/references/blocks.md +20 -0
- package/src/defaults/skills/pdf/references/forms.md +12 -0
- package/src/defaults/skills/pdf/references/html.md +2 -2
- package/src/defaults/skills/pdf/references/ocr.md +7 -0
- package/src/defaults/skills/pdf/references/security.md +8 -0
- package/src/defaults/skills/pptx/SKILL.md +30 -109
- package/src/defaults/skills/pptx/references/audit.md +45 -0
- package/src/defaults/skills/pptx/references/brief-critique.md +47 -0
- package/src/defaults/skills/pptx/references/editing.md +24 -0
- package/src/defaults/skills/pptx/references/html.md +1 -1
- package/src/defaults/skills/pptx/references/script.md +33 -0
- package/src/defaults/skills/setup/SKILL.md +34 -102
- package/src/defaults/skills/setup/references/actions.md +73 -14
- package/src/defaults/skills/setup/references/surfaces.md +23 -8
- package/src/defaults/skills/setup-guide/SKILL.md +28 -115
- package/src/defaults/skills/setup-guide/references/features.md +36 -0
- package/src/defaults/skills/setup-guide/references/glossary.md +38 -0
- package/src/defaults/skills/setup-guide/references/workflow-models.md +62 -0
- package/src/defaults/skills/test-suite/SKILL.md +15 -127
- package/src/defaults/skills/test-suite/references/case-management.md +17 -9
- package/src/defaults/skills/test-suite/references/diagnose.md +23 -0
- package/src/defaults/skills/test-suite/references/prune.md +27 -0
- package/src/defaults/skills/test-suite/references/write.md +44 -0
- package/src/defaults/skills/video/SKILL.md +28 -42
- package/src/defaults/skills/video/references/prompting.md +31 -0
- package/src/defaults/skills/visualize/SKILL.md +73 -107
- package/src/defaults/skills/visualize/references/craft.md +1 -2
- package/src/defaults/skills/visualize/references/feedback.md +36 -0
- package/src/defaults/skills/visualize/references/showing.md +13 -0
- package/src/defaults/skills/xlsx/SKILL.md +23 -50
- package/src/defaults/skills/xlsx/references/editing.md +15 -0
- package/src/defaults/skills/xlsx/references/model-conventions.md +1 -1
- package/src/defaults/skills/xlsx/references/recalculation.md +37 -0
- package/src/defaults/skills/xlsx/references/report-design.md +18 -2
- package/src/lib/keychain-cjs.cjs +22 -1
- package/src/lib/rules-builder.cjs +1 -1
- package/src/rules/agent/AGENT.md +3 -0
- package/src/rules/agent-mode/MIXY.md +5 -3
- package/src/rules/lead/LEAD.md +3 -1
- package/src/runtime/agent/orchestrator/agent-runtime/cache-strategy.mjs +8 -30
- package/src/runtime/agent/orchestrator/agent-runtime/title-completion.mjs +5 -0
- package/src/runtime/agent/orchestrator/mcp/oauth-request.mjs +21 -2
- package/src/runtime/agent/orchestrator/providers/account-pool.mjs +3 -0
- package/src/runtime/agent/orchestrator/providers/admission-scheduler.mjs +4 -3
- package/src/runtime/agent/orchestrator/providers/anthropic-api-request.mjs +11 -1
- package/src/runtime/agent/orchestrator/providers/anthropic-api-transport.mjs +2 -0
- package/src/runtime/agent/orchestrator/providers/anthropic-message-threads.mjs +583 -0
- package/src/runtime/agent/orchestrator/providers/anthropic-oauth-client-version.mjs +1 -1
- package/src/runtime/agent/orchestrator/providers/anthropic-oauth.mjs +81 -19
- package/src/runtime/agent/orchestrator/providers/anthropic-sse-turn/turn-events/content-block-start.mjs +4 -0
- package/src/runtime/agent/orchestrator/providers/anthropic-sse-turn/turn-outcome.mjs +2 -0
- package/src/runtime/agent/orchestrator/providers/anthropic-sse.mjs +180 -13
- package/src/runtime/agent/orchestrator/providers/anthropic-turn-result.mjs +2 -0
- package/src/runtime/agent/orchestrator/providers/anthropic.mjs +58 -6
- package/src/runtime/agent/orchestrator/providers/cursor-wire.mjs +4 -2
- package/src/runtime/agent/orchestrator/providers/custom-provider-config.mjs +121 -9
- package/src/runtime/agent/orchestrator/providers/custom-provider.mjs +4 -1
- package/src/runtime/agent/orchestrator/providers/gemini-error-contract.mjs +6 -6
- package/src/runtime/agent/orchestrator/providers/gemini-model-redirect.mjs +44 -0
- package/src/runtime/agent/orchestrator/providers/gemini-reasoning-relay.mjs +5 -0
- package/src/runtime/agent/orchestrator/providers/gemini-request-body.mjs +34 -5
- package/src/runtime/agent/orchestrator/providers/gemini-response.mjs +10 -0
- package/src/runtime/agent/orchestrator/providers/gemini-schema.mjs +11 -6
- package/src/runtime/agent/orchestrator/providers/gemini-sdk-request.mjs +4 -100
- package/src/runtime/agent/orchestrator/providers/gemini-stream.mjs +3 -227
- package/src/runtime/agent/orchestrator/providers/gemini.mjs +226 -118
- package/src/runtime/agent/orchestrator/providers/lib/anthropic-request-utils.mjs +11 -1
- package/src/runtime/agent/orchestrator/providers/lib/claude-bridge-schema.mjs +15 -3
- package/src/runtime/agent/orchestrator/providers/lib/gemini-model-catalog.mjs +2 -1
- package/src/runtime/agent/orchestrator/providers/lib/generation-window.mjs +9 -0
- package/src/runtime/agent/orchestrator/providers/openai-compat-chat-send.mjs +9 -1
- package/src/runtime/agent/orchestrator/providers/openai-compat-chat-stream/stream-result.mjs +2 -0
- package/src/runtime/agent/orchestrator/providers/openai-compat-chat-stream/stream-state.mjs +5 -0
- package/src/runtime/agent/orchestrator/providers/openai-compat-options.mjs +3 -0
- package/src/runtime/agent/orchestrator/providers/openai-compat-response-normalization.mjs +2 -0
- package/src/runtime/agent/orchestrator/providers/openai-compat-responses.mjs +10 -1
- package/src/runtime/agent/orchestrator/providers/openai-direct-request.mjs +5 -28
- package/src/runtime/agent/orchestrator/providers/openai-http-sse-response-state/response-events.mjs +3 -0
- package/src/runtime/agent/orchestrator/providers/openai-http-sse-response-state/response-outcome.mjs +2 -0
- package/src/runtime/agent/orchestrator/providers/openai-ws-pool.mjs +50 -28
- package/src/runtime/agent/orchestrator/providers/openai-ws-response-state.mjs +9 -2
- package/src/runtime/agent/orchestrator/providers/openai-ws-stream/socket-handlers.mjs +14 -10
- package/src/runtime/agent/orchestrator/providers/openai-ws.mjs +1 -3
- package/src/runtime/agent/orchestrator/providers/openrouter-provider-routing.mjs +28 -0
- package/src/runtime/agent/orchestrator/providers/openrouter.mjs +4 -1
- package/src/runtime/agent/orchestrator/providers/registry.mjs +30 -25
- package/src/runtime/agent/orchestrator/providers/stream-json-pool/worker-slots/slot-spawn.mjs +8 -3
- package/src/runtime/agent/orchestrator/providers/vertex-ai-maas.mjs +2 -2
- package/src/runtime/agent/orchestrator/runtime-core/ask-user-result.mjs +66 -0
- package/src/runtime/agent/orchestrator/runtime-core/config-helpers.mjs +4 -5
- package/src/runtime/agent/orchestrator/runtime-core/goal-tool-defs.mjs +2 -2
- package/src/runtime/agent/orchestrator/runtime-core/provider-request-tools.mjs +15 -8
- package/src/runtime/agent/orchestrator/runtime-core/session-title.mjs +1 -0
- package/src/runtime/agent/orchestrator/runtime-core/todo-list.mjs +9 -32
- package/src/runtime/agent/orchestrator/runtime-core/todo-tool-defs.mjs +4 -5
- package/src/runtime/agent/orchestrator/session/compact/summary-route.mjs +1 -3
- package/src/runtime/agent/orchestrator/session/loop/compact-policy.mjs +5 -2
- package/src/runtime/agent/orchestrator/session/loop/no-tool-turn/todo-check.mjs +2 -17
- package/src/runtime/agent/orchestrator/session/loop/usage.mjs +7 -3
- package/src/runtime/agent/orchestrator/session/manager/ask-turn-settle.mjs +9 -2
- package/src/runtime/agent/orchestrator/session/manager/runtime-liveness.mjs +8 -1
- package/src/runtime/agent/orchestrator/session/manager/session-close.mjs +26 -13
- package/src/runtime/agent/orchestrator/session/manager/session-lifecycle.mjs +4 -5
- package/src/runtime/agent/orchestrator/session/manager/usage-metrics.mjs +16 -5
- package/src/runtime/agent/orchestrator/session/store/lifecycle-barriers.mjs +22 -1
- package/src/runtime/agent/orchestrator/session/store/live-state.mjs +4 -0
- package/src/runtime/agent/orchestrator/session/store.mjs +12 -6
- package/src/runtime/agent/orchestrator/tools/builtin/cache-layers.mjs +11 -9
- package/src/runtime/agent/orchestrator/tools/builtin/grep-formatting.mjs +2 -8
- package/src/runtime/agent/orchestrator/tools/builtin/lib/search-input-helpers.mjs +1 -9
- package/src/runtime/agent/orchestrator/tools/builtin/lib/shell-output-silence.mjs +64 -0
- package/src/runtime/agent/orchestrator/tools/builtin/lib/shell-task-output.mjs +20 -6
- package/src/runtime/agent/orchestrator/tools/builtin/local-search-telemetry.mjs +2 -2
- package/src/runtime/agent/orchestrator/tools/builtin/native-search-client.mjs +1 -1
- package/src/runtime/agent/orchestrator/tools/builtin/runtime-capabilities.mjs +12 -3
- package/src/runtime/agent/orchestrator/tools/builtin/task-tool.mjs +12 -1
- package/src/runtime/agent/orchestrator/tools/code-graph/ast-calls.mjs +9 -2
- package/src/runtime/agent/orchestrator/tools/code-graph/build.mjs +137 -7
- package/src/runtime/agent/orchestrator/tools/code-graph/calls-cache.mjs +43 -14
- package/src/runtime/agent/orchestrator/tools/code-graph/calls-sidecar-worker.mjs +33 -0
- package/src/runtime/agent/orchestrator/tools/code-graph/disk-cache.mjs +146 -11
- package/src/runtime/agent/orchestrator/tools/code-graph/dispatch.mjs +31 -24
- package/src/runtime/agent/orchestrator/tools/code-graph/graph-binary/spawn-jsonl.mjs +172 -25
- package/src/runtime/agent/orchestrator/tools/code-graph/graph-model.mjs +100 -2
- package/src/runtime/agent/orchestrator/tools/code-graph/main-thread-slice.mjs +18 -0
- package/src/runtime/agent/orchestrator/tools/code-graph/mask-pool.mjs +219 -0
- package/src/runtime/agent/orchestrator/tools/code-graph/mask-worker.mjs +12 -0
- package/src/runtime/agent/orchestrator/tools/code-graph/memory-cache.mjs +6 -1
- package/src/runtime/agent/orchestrator/tools/code-graph/modes/calls.mjs +9 -2
- package/src/runtime/agent/orchestrator/tools/code-graph/modes/dependents.mjs +5 -1
- package/src/runtime/agent/orchestrator/tools/code-graph/modes/structure.mjs +8 -2
- package/src/runtime/agent/orchestrator/tools/code-graph/modes/symbols.mjs +14 -11
- package/src/runtime/agent/orchestrator/tools/code-graph/search-references.mjs +41 -18
- package/src/runtime/agent/orchestrator/tools/code-graph/search.mjs +391 -83
- package/src/runtime/agent/orchestrator/tools/code-graph/symbol-index.mjs +109 -9
- package/src/runtime/agent/orchestrator/tools/code-graph/text-mask.mjs +73 -29
- package/src/runtime/agent/orchestrator/tools/code-graph-prewarm-worker.mjs +6 -5
- package/src/runtime/agent/orchestrator/tools/lib/native-spawn-client.mjs +7 -3
- package/src/runtime/channels/lib/crash-log.mjs +21 -1
- package/src/runtime/channels/lib/routines-db.mjs +35 -0
- package/src/runtime/channels/lib/schedules-db.mjs +4 -0
- package/src/runtime/channels/lib/webhooks-db.mjs +4 -0
- package/src/runtime/channels/lib/worker-main.mjs +8 -25
- package/src/runtime/computer-bridge/action-schema.mjs +2 -2
- package/src/runtime/computer-bridge/core-actions.mjs +16 -2
- package/src/runtime/computer-bridge/result-canonical.mjs +6 -0
- package/src/runtime/media/jobs.mjs +5 -0
- package/src/runtime/media/store.mjs +146 -3
- package/src/runtime/memory/tool-defs.mjs +1 -1
- package/src/runtime/office/core/office-write-ledger.mjs +2 -2
- package/src/runtime/shared/agent-reap-state.mjs +19 -0
- package/src/runtime/shared/desktop-notice-host.d.mts +13 -0
- package/src/runtime/shared/desktop-notice-host.mjs +87 -0
- package/src/runtime/shared/file-lock.mjs +2 -2
- package/src/runtime/shared/heap-cap.mjs +9 -11
- package/src/runtime/shared/llm/http-agent.mjs +11 -1
- package/src/runtime/shared/llm/system-proxy.mjs +100 -25
- package/src/runtime/shared/llm/usage-accounting.mjs +121 -19
- package/src/runtime/shared/llm/usage-context.mjs +3 -3
- package/src/runtime/shared/llm/usage-ledger-quota.mjs +2 -0
- package/src/runtime/shared/llm/usage-ledger-requests.mjs +190 -0
- package/src/runtime/shared/llm/usage-ledger-rollup.mjs +7 -3
- package/src/runtime/shared/llm/usage-ledger-worker.mjs +2 -0
- package/src/runtime/shared/llm/usage-ledger.mjs +69 -1
- package/src/runtime/shared/llm/usage-request-status.mjs +48 -0
- package/src/runtime/shared/provider-accounts.mjs +22 -0
- package/src/runtime/shared/provider-auth-binding.mjs +2 -2
- package/src/runtime/shared/resource-admission.mjs +2 -2
- package/src/runtime/shared/root-async-context.mjs +51 -0
- package/src/runtime/shared/run-child.mjs +18 -1
- package/src/runtime/shared/slow-span.mjs +2 -2
- package/src/runtime/shared/tool-execution-owner.mjs +2 -2
- package/src/runtime/shared/tool-result-summary.mjs +1 -1
- package/src/runtime/shared/tool-work-units.mjs +2 -0
- package/src/runtime/shared/turn-snapshot-store.mjs +75 -18
- package/src/runtime/shared/turn-worktree-snapshot.mjs +38 -8
- package/src/runtime/shared/user-cwd.mjs +2 -2
- package/src/runtime/shared/worker-requests.mjs +3 -1
- package/src/runtime/shared/worktrees/lock.mjs +2 -2
- package/src/runtime/visualize-bridge/client.mjs +26 -4
- package/src/runtime/visualize-bridge/tool-defs.mjs +46 -5
- package/src/session-runtime/agent-home-delivery.mjs +76 -8
- package/src/session-runtime/agent-task-sessions.mjs +63 -22
- package/src/session-runtime/boot/apis.mjs +16 -0
- package/src/session-runtime/boot/begin.mjs +2 -0
- package/src/session-runtime/boot/tools.mjs +8 -2
- package/src/session-runtime/internal-tool-executor/ask-user-tool.mjs +3 -58
- package/src/session-runtime/media-api.mjs +15 -0
- package/src/session-runtime/model-route/route-persist.mjs +12 -4
- package/src/session-runtime/provider-models/row-hydration.mjs +2 -0
- package/src/session-runtime/provider-readiness.mjs +10 -2
- package/src/session-runtime/routine-owner.mjs +9 -3
- package/src/session-runtime/runtime-core.mjs +35 -8
- package/src/session-runtime/runtime-review-api.mjs +3 -1
- package/src/session-runtime/services/agent-task-status.mjs +29 -1
- package/src/session-runtime/services/agent-tool/close-flow.mjs +6 -1
- package/src/session-runtime/services/agent-tool/execute-resume.mjs +94 -0
- package/src/session-runtime/services/agent-tool/execute-send.mjs +77 -27
- package/src/session-runtime/services/agent-tool/execute-spawn.mjs +28 -7
- package/src/session-runtime/services/agent-tool/execute.mjs +6 -1
- package/src/session-runtime/services/agent-tool/helpers.mjs +11 -0
- package/src/session-runtime/services/agent-tool/job-views/job-render.mjs +13 -10
- package/src/session-runtime/services/agent-tool/job-views/session-progress.mjs +3 -0
- package/src/session-runtime/services/agent-tool/render.mjs +8 -1
- package/src/session-runtime/services/agent-tool/send-flow.mjs +1 -0
- package/src/session-runtime/services/agent-tool/spawn-flow/spawn-prep.mjs +6 -0
- package/src/session-runtime/services/agent-tool/spawn-flow/spawn-run.mjs +2 -1
- package/src/session-runtime/services/agent-tool/tag-registry/reaped-sessions.mjs +82 -0
- package/src/session-runtime/services/agent-tool/tag-registry/record-facts-worker.mjs +36 -0
- package/src/session-runtime/services/agent-tool/tag-registry.mjs +4 -0
- package/src/session-runtime/services/agent-tool/terminal-reaper/row-helpers.mjs +29 -0
- package/src/session-runtime/services/agent-tool/terminal-reaper/scan-admission.mjs +11 -3
- package/src/session-runtime/services/agent-tool/terminal-reaper/stale-rows.mjs +19 -8
- package/src/session-runtime/services/agent-tool/terminal-reaper.mjs +5 -2
- package/src/session-runtime/services/agent-tool/worker-index.mjs +1 -0
- package/src/session-runtime/services/channel-admin.mjs +44 -3
- package/src/session-runtime/services/daemon-crash-capture/daemon-exit-record.mjs +2 -2
- package/src/session-runtime/services/plugin-admin.mjs +46 -7
- package/src/session-runtime/services/provider-admin.mjs +5 -0
- package/src/session-runtime/session-create.mjs +5 -0
- package/src/session-runtime/setup-tool/agent-settings-actions.mjs +1 -1
- package/src/session-runtime/setup-tool/executor.mjs +1 -1
- package/src/session-runtime/setup-tool/extended-actions.mjs +1 -1
- package/src/session-runtime/setup-tool/settings-contract.mjs +4 -2
- package/src/session-runtime/usage-stats-api.mjs +120 -1
- package/src/session-runtime/workflow-agents-api/agent-connectors.mjs +36 -29
- package/src/session-runtime/workflow-agents-api/agent-editor.mjs +183 -23
- package/src/session-runtime/workspace/admission-gate.mjs +25 -7
- package/src/session-runtime/workspace/transitions.mjs +4 -0
- package/src/standalone/daemon-log.mjs +28 -4
- package/src/standalone/daemon-owner.mjs +41 -7
- package/src/standalone/daemon-work-gate.mjs +139 -0
- package/src/standalone/daemon.mjs +80 -11
- package/src/standalone/desktop-service-registry.mjs +11 -4
- package/src/standalone/session-client.mjs +57 -5
- package/src/standalone/session-protocol.mjs +6 -0
- package/src/standalone/session-service/agent-tree/agent-cancel.mjs +17 -1
- package/src/standalone/session-service/agent-tree.mjs +7 -0
- package/src/standalone/session-service/retention/busy.mjs +3 -2
- package/src/standalone/session-service/session-calls/session-turns.mjs +12 -5
- package/src/standalone/session-transport/call-route.mjs +10 -4
- package/src/standalone/session-transport/routes.mjs +21 -0
- package/src/standalone/session-transport/stack.mjs +3 -1
- package/src/standalone/session-transport.mjs +5 -0
- package/src/tui/app/model-picker/model-footer.mjs +1 -1
- package/src/tui/app/model-picker/provider-models-list.mjs +7 -3
- package/src/tui/app/model-picker/route-selection/fast-parameters.mjs +23 -3
- package/src/tui/app/model-picker/route-selection.mjs +1 -0
- package/src/tui/dist/index.mjs +536 -484
- package/src/tui/session/session-api/integrations.mjs +3 -0
- package/src/tui/session/session-api/media.mjs +5 -0
- package/src/tui/session/tool-approval-settle.mjs +24 -4
- package/src/tui/session/tool-approval.mjs +35 -10
- package/src/tui/session/turn.mjs +13 -0
- package/src/runtime/agent/orchestrator/providers/gemini-sdk-stream/cancellation.mjs +0 -71
- package/src/runtime/agent/orchestrator/providers/gemini-sdk-stream/reader.mjs +0 -108
|
@@ -662,14 +662,31 @@ export async function shutdownDaemon(
|
|
|
662
662
|
* with it, so ask the serving one to stop (forced — its work cannot outlive
|
|
663
663
|
* this tree anyway) and wait, bounded, for every such child's graceful exit.
|
|
664
664
|
* One that already unpublished its endpoint is mid-teardown: only waited on.
|
|
665
|
-
*
|
|
665
|
+
* The outcome says what happened, so a quit that ends in the tree kill can
|
|
666
|
+
* be told apart: `stopped` is false when no such child is alive (detached,
|
|
667
|
+
* or another launcher's) or one outlived the wait; `request` is `sent`,
|
|
668
|
+
* `failed` (with `error`), `no-discovery`, `not-in-tree` (daemon.json names
|
|
669
|
+
* another pid) or `none` (nothing in the tree). */
|
|
666
670
|
export async function stopInTreeDaemon({
|
|
667
671
|
timeoutMs = IN_TREE_DAEMON_STOP_GRACE_MS,
|
|
668
672
|
discovery = readSessionDiscovery(),
|
|
669
673
|
} = {}) {
|
|
674
|
+
const startedAt = Date.now();
|
|
670
675
|
const pids = [...inTreeDaemons.keys()].filter((pid) => isPidAlive(pid));
|
|
671
|
-
|
|
672
|
-
|
|
676
|
+
const outcome = {
|
|
677
|
+
stopped: false,
|
|
678
|
+
inTree: pids,
|
|
679
|
+
discoveryPid: Number(discovery?.pid) || null,
|
|
680
|
+
request: 'none',
|
|
681
|
+
error: null,
|
|
682
|
+
elapsedMs: 0,
|
|
683
|
+
};
|
|
684
|
+
if (!pids.length) return outcome;
|
|
685
|
+
if (!discovery?.port) {
|
|
686
|
+
outcome.request = 'no-discovery';
|
|
687
|
+
} else if (!pids.includes(Number(discovery.pid))) {
|
|
688
|
+
outcome.request = 'not-in-tree';
|
|
689
|
+
} else {
|
|
673
690
|
try {
|
|
674
691
|
await request({
|
|
675
692
|
port: discovery.port,
|
|
@@ -680,13 +697,48 @@ export async function stopInTreeDaemon({
|
|
|
680
697
|
timeoutMs: 3000,
|
|
681
698
|
control: true,
|
|
682
699
|
});
|
|
683
|
-
|
|
700
|
+
outcome.request = 'sent';
|
|
701
|
+
} catch (error) {
|
|
684
702
|
// Past its front door already: only the wait remains.
|
|
703
|
+
outcome.request = 'failed';
|
|
704
|
+
outcome.error = String(error?.message || error);
|
|
685
705
|
}
|
|
686
706
|
}
|
|
687
707
|
const deadline = Date.now() + Math.max(1, Number(timeoutMs) || IN_TREE_DAEMON_STOP_GRACE_MS);
|
|
688
708
|
while (pids.some((pid) => isPidAlive(pid)) && Date.now() < deadline) await delay(50);
|
|
689
|
-
|
|
709
|
+
outcome.stopped = !pids.some((pid) => isPidAlive(pid));
|
|
710
|
+
outcome.elapsedMs = Date.now() - startedAt;
|
|
711
|
+
return outcome;
|
|
712
|
+
}
|
|
713
|
+
|
|
714
|
+
/** Before an update install tears the app down: close new-work admission on
|
|
715
|
+
* the in-tree daemon and read its running count in one daemon-side step.
|
|
716
|
+
* `held` — idle, admission stays closed until release (or the hold lapses);
|
|
717
|
+
* `busy` — turns run, admission was left open, `busy` is the count;
|
|
718
|
+
* `none` — no in-tree daemon serves, so the install kills nothing;
|
|
719
|
+
* `unknown` — the daemon could not be asked. `release` reopens admission. */
|
|
720
|
+
export async function holdInTreeDaemon({ release = false, ttlMs, discovery = readSessionDiscovery() } = {}) {
|
|
721
|
+
const pids = [...inTreeDaemons.keys()].filter((pid) => isPidAlive(pid));
|
|
722
|
+
if (!pids.length) return { status: 'none', busy: 0, error: null };
|
|
723
|
+
if (discovery?.port && !pids.includes(Number(discovery.pid))) return { status: 'none', busy: 0, error: null };
|
|
724
|
+
if (!discovery?.port) return { status: 'unknown', busy: 0, error: 'no daemon discovery' };
|
|
725
|
+
try {
|
|
726
|
+
const answer = await request({
|
|
727
|
+
port: discovery.port,
|
|
728
|
+
token: discovery.token,
|
|
729
|
+
method: 'POST',
|
|
730
|
+
path: '/install-hold',
|
|
731
|
+
body: release ? { action: 'release' } : { action: 'close', ttlMs },
|
|
732
|
+
timeoutMs: 3000,
|
|
733
|
+
control: true,
|
|
734
|
+
});
|
|
735
|
+
if (release) return { status: 'released', busy: 0, error: null };
|
|
736
|
+
if (answer?.held === true) return { status: 'held', busy: 0, error: null };
|
|
737
|
+
if (Number(answer?.busy) > 0) return { status: 'busy', busy: Number(answer.busy), error: null };
|
|
738
|
+
return { status: 'unknown', busy: 0, error: 'unexpected hold answer' };
|
|
739
|
+
} catch (error) {
|
|
740
|
+
return { status: 'unknown', busy: 0, error: String(error?.message || error) };
|
|
741
|
+
}
|
|
690
742
|
}
|
|
691
743
|
|
|
692
744
|
export async function shutdownDaemonForRuntimeRoot(root, options = {}) {
|
|
@@ -77,6 +77,7 @@ export const SESSION_READ_ACTIONS = Object.freeze([
|
|
|
77
77
|
'getUpdateStatus',
|
|
78
78
|
'getUsageDashboard',
|
|
79
79
|
'getUsageStats',
|
|
80
|
+
'getUsageRequests',
|
|
80
81
|
'getVoiceStatus',
|
|
81
82
|
'isSetupRequestActive',
|
|
82
83
|
'getWorkflowPack',
|
|
@@ -91,6 +92,7 @@ export const SESSION_READ_ACTIONS = Object.freeze([
|
|
|
91
92
|
'listAgents',
|
|
92
93
|
'listImportableConversations',
|
|
93
94
|
'listMediaAssets',
|
|
95
|
+
'listMediaBoards',
|
|
94
96
|
'listMediaLanes',
|
|
95
97
|
'listOutputStyles',
|
|
96
98
|
'listPresets',
|
|
@@ -145,6 +147,10 @@ export const SESSION_CONFIGURE_ACTIONS = Object.freeze([
|
|
|
145
147
|
'deleteHookRule',
|
|
146
148
|
'deleteMediaAsset',
|
|
147
149
|
'deleteMediaAssets',
|
|
150
|
+
'createMediaBoard',
|
|
151
|
+
'renameMediaBoard',
|
|
152
|
+
'deleteMediaBoard',
|
|
153
|
+
'setMediaAssetBoard',
|
|
148
154
|
'deleteSchedule',
|
|
149
155
|
'saveCustomProvider',
|
|
150
156
|
'saveCustomProviderKey',
|
|
@@ -23,9 +23,25 @@ export function createAgentCancellation({
|
|
|
23
23
|
entryForSession,
|
|
24
24
|
log,
|
|
25
25
|
rememberCancelTranscript,
|
|
26
|
+
markOwnerClosed,
|
|
26
27
|
}) {
|
|
27
28
|
const agentCloseRuns = new Map();
|
|
28
29
|
|
|
30
|
+
// The agent's owner closed it (options.ownerClose): recorded on the stored
|
|
31
|
+
// record itself once the runtime is closed, whichever close got it there —
|
|
32
|
+
// this one, an earlier one for another reason, or one already in progress.
|
|
33
|
+
async function closeOne(id, reason, options) {
|
|
34
|
+
const closed = await closeRuntime(id, reason, options);
|
|
35
|
+
if (closed && options.ownerClose === true) {
|
|
36
|
+
const outcome = { absent: false };
|
|
37
|
+
const generation = await markOwnerClosed(id, reason, { outcome });
|
|
38
|
+
if (typeof generation !== 'number' && outcome.absent !== true) {
|
|
39
|
+
throw new Error(`agent session ${id}: the owner close could not be recorded`);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
return closed;
|
|
43
|
+
}
|
|
44
|
+
|
|
29
45
|
/** The runtime entry that can close this descriptor: the live owner, else a
|
|
30
46
|
* freshly loaded one (null when loading fails, which is logged). */
|
|
31
47
|
const closableEntry = async (id, descriptor) => {
|
|
@@ -44,7 +60,7 @@ export function createAgentCancellation({
|
|
|
44
60
|
}
|
|
45
61
|
};
|
|
46
62
|
|
|
47
|
-
function
|
|
63
|
+
function closeRuntime(id, reason, options) {
|
|
48
64
|
const active = agentCloseRuns.get(id);
|
|
49
65
|
if (active) return active;
|
|
50
66
|
let run;
|
|
@@ -24,6 +24,12 @@ export function createAgentTree({
|
|
|
24
24
|
entryForSession,
|
|
25
25
|
retainUnwatched,
|
|
26
26
|
createSession,
|
|
27
|
+
// Sessions run inline in this daemon, so its own store records the owner
|
|
28
|
+
// close; loaded on first use only.
|
|
29
|
+
markOwnerClosed = async (...args) =>
|
|
30
|
+
(await import('../../runtime/agent/orchestrator/session/store/lifecycle-barriers.mjs')).markSessionOwnerClosedAsync(
|
|
31
|
+
...args
|
|
32
|
+
),
|
|
27
33
|
} = {}) {
|
|
28
34
|
const registry = createAgentRegistry();
|
|
29
35
|
const progress = new Map();
|
|
@@ -110,6 +116,7 @@ export function createAgentTree({
|
|
|
110
116
|
entryForSession,
|
|
111
117
|
log,
|
|
112
118
|
rememberCancelTranscript,
|
|
119
|
+
markOwnerClosed,
|
|
113
120
|
});
|
|
114
121
|
|
|
115
122
|
/** The descriptor as callers see it: status from the live runtime when one
|
|
@@ -35,10 +35,11 @@ export function createBusyTracker({ sessions, currentSessionId }) {
|
|
|
35
35
|
// status source every list row has, open pane or not — re-reads it.
|
|
36
36
|
const awaitingApproval = Boolean(state?.toolApproval);
|
|
37
37
|
const awaitingQuestion = state?.toolApproval?.kind === 'question';
|
|
38
|
-
// A room member's handed-off questions coming
|
|
38
|
+
// A room member's handed-off questions coming, settling (`record`) and
|
|
39
|
+
// going re-read it too.
|
|
39
40
|
const sessionId = currentSessionId(entry) || '';
|
|
40
41
|
const handoffQuestions = roomHandoffQuestionsOf(sessionId, state)
|
|
41
|
-
.map((question) => String(question?.id ?? ''))
|
|
42
|
+
.map((question) => `${String(question?.id ?? '')}${typeof question?.record === 'string' ? ':settled' : ''}`)
|
|
42
43
|
.join('\n');
|
|
43
44
|
if (
|
|
44
45
|
awaitingApproval !== (entry.awaitingApproval === true) ||
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
// ./goal-recovery.mjs.
|
|
6
6
|
import { createGoalRecovery } from './goal-recovery.mjs';
|
|
7
7
|
import { createSessionTurnGate } from './turn-gate.mjs';
|
|
8
|
+
import { daemonWorkGate } from '../../daemon-work-gate.mjs';
|
|
8
9
|
import {
|
|
9
10
|
attachmentsForIntake,
|
|
10
11
|
materializePromptSubmission,
|
|
@@ -79,11 +80,17 @@ export function createSessionTurnCalls(ctx) {
|
|
|
79
80
|
}
|
|
80
81
|
}
|
|
81
82
|
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
83
|
+
// Every in-daemon turn start (scheduled fires, routines, channel and
|
|
84
|
+
// agent-report turns) waits out an update install's hold rather than
|
|
85
|
+
// starting during the teardown; it is deferred, not dropped.
|
|
86
|
+
const submitSession = daemonWorkGate.deferring(
|
|
87
|
+
async (params = {}) => {
|
|
88
|
+
const id = String(params?.sessionId || '');
|
|
89
|
+
if (!id) throw new TypeError('sessionId is required');
|
|
90
|
+
return admitted(id, () => submitAdmitted(id, params));
|
|
91
|
+
},
|
|
92
|
+
(params) => params?.signal
|
|
93
|
+
);
|
|
87
94
|
|
|
88
95
|
async function submitAdmitted(
|
|
89
96
|
id,
|
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
import { sendJson, sendError } from '../../runtime/memory/lib/http-wire.mjs';
|
|
8
8
|
import { callSignature, callIdConflict, clientCallOwner } from '../rpc-call-identity.mjs';
|
|
9
9
|
import { callLane } from './call-lanes.mjs';
|
|
10
|
+
import { createWorkGate } from '../daemon-work-gate.mjs';
|
|
10
11
|
|
|
11
12
|
// These routes are safe to replay and can return large snapshots. Keeping
|
|
12
13
|
// them in the mutation-dedup cache retained multiple transcript copies for a
|
|
@@ -44,7 +45,7 @@ function cachedDispatch(cached, callId, signature) {
|
|
|
44
45
|
return cached.promise;
|
|
45
46
|
}
|
|
46
47
|
|
|
47
|
-
export function createCallRoute({ handleCall, clients, lanes, callCache, nowMs }) {
|
|
48
|
+
export function createCallRoute({ handleCall, clients, lanes, callCache, nowMs, workGate = createWorkGate() }) {
|
|
48
49
|
return async function handleCallRequest(body, res) {
|
|
49
50
|
const clientToken = body.token ? String(body.token) : null;
|
|
50
51
|
const c = clientToken ? clients.get(clientToken) : null;
|
|
@@ -72,13 +73,18 @@ export function createCallRoute({ handleCall, clients, lanes, callCache, nowMs }
|
|
|
72
73
|
} else {
|
|
73
74
|
dispatch = lanes.dispatch(
|
|
74
75
|
ownerKeyFor(clientToken, c, body.args),
|
|
75
|
-
() =>
|
|
76
|
-
|
|
76
|
+
() => {
|
|
77
|
+
// The gate is asked again where the call actually starts: one that
|
|
78
|
+
// queued before a hold must not begin during the teardown.
|
|
79
|
+
const refusal = workGate.callRefusal(name);
|
|
80
|
+
if (refusal) throw Object.assign(new Error(refusal), { code: 'EINSTALLHOLD' });
|
|
81
|
+
return handleCall(name, args, {
|
|
77
82
|
clientToken,
|
|
78
83
|
leadPid: c.leadPid ?? null,
|
|
79
84
|
cwd: c.cwd ?? null,
|
|
80
85
|
revision: c.revision ?? 0,
|
|
81
|
-
})
|
|
86
|
+
});
|
|
87
|
+
},
|
|
82
88
|
{ lane: callLane(name, args) }
|
|
83
89
|
);
|
|
84
90
|
if (cacheKey) callCache.track(cacheKey, dispatch, signature);
|
|
@@ -53,6 +53,7 @@ export function createTransportRoutes({
|
|
|
53
53
|
transportMemory,
|
|
54
54
|
onClientsEmpty,
|
|
55
55
|
onUpgradeRequested,
|
|
56
|
+
workGate,
|
|
56
57
|
admitWork = () => true,
|
|
57
58
|
}) {
|
|
58
59
|
// Checked on every register/call, last right before the work is handed on
|
|
@@ -82,6 +83,7 @@ export function createTransportRoutes({
|
|
|
82
83
|
modelProxy: modelProxyClientMode() ? 'client' : null,
|
|
83
84
|
draining: drain.reason || null,
|
|
84
85
|
drainCommitted: drain.committed,
|
|
86
|
+
installHold: workGate.held,
|
|
85
87
|
version: runtimeVersion(),
|
|
86
88
|
packageVersion: runtimeVersion(),
|
|
87
89
|
buildHash: remoteInstallBuildHash(),
|
|
@@ -160,9 +162,27 @@ export function createTransportRoutes({
|
|
|
160
162
|
// Again right before dispatch: the lease may have been fenced while the
|
|
161
163
|
// body was still arriving.
|
|
162
164
|
if (await refuseUnadmitted(res)) return;
|
|
165
|
+
const refusal = workGate.callRefusal(body.name);
|
|
166
|
+
if (refusal) {
|
|
167
|
+
sendError(res, refusal, 503);
|
|
168
|
+
return;
|
|
169
|
+
}
|
|
163
170
|
await callRoute(body, res);
|
|
164
171
|
};
|
|
165
172
|
|
|
173
|
+
// The desktop's update install asks to close the daemon's admission gate and
|
|
174
|
+
// read the running count in one step (daemon-work-gate.mjs): busy leaves it
|
|
175
|
+
// open, idle keeps it closed until `release`, shutdown, or the lease lapses.
|
|
176
|
+
const installHold = async (req, res) => {
|
|
177
|
+
const body = await readBody(req);
|
|
178
|
+
if (body.action === 'release') {
|
|
179
|
+
workGate.release();
|
|
180
|
+
sendJson(res, { ok: true, held: false });
|
|
181
|
+
return;
|
|
182
|
+
}
|
|
183
|
+
sendJson(res, { ok: true, ...workGate.hold(body.ttlMs) });
|
|
184
|
+
};
|
|
185
|
+
|
|
166
186
|
const shutdown = (res) => {
|
|
167
187
|
sendJson(res, { ok: true });
|
|
168
188
|
if (typeof onClientsEmpty === 'function') {
|
|
@@ -230,6 +250,7 @@ export function createTransportRoutes({
|
|
|
230
250
|
'POST /call': call,
|
|
231
251
|
'POST /shutdown': (_req, res) => shutdown(res),
|
|
232
252
|
'POST /stop': stop,
|
|
253
|
+
'POST /install-hold': installHold,
|
|
233
254
|
'POST /upgrade': upgrade,
|
|
234
255
|
};
|
|
235
256
|
|
|
@@ -76,6 +76,7 @@ export function createTransportStack({
|
|
|
76
76
|
onClientDropped,
|
|
77
77
|
onUpgradeRequested,
|
|
78
78
|
getStatus,
|
|
79
|
+
workGate,
|
|
79
80
|
admitWork,
|
|
80
81
|
}) {
|
|
81
82
|
const body = createBodyReader();
|
|
@@ -113,7 +114,8 @@ export function createTransportStack({
|
|
|
113
114
|
readBody: body.readBody,
|
|
114
115
|
registry,
|
|
115
116
|
lanes,
|
|
116
|
-
callRoute: createCallRoute({ handleCall, clients, lanes, callCache, nowMs }),
|
|
117
|
+
callRoute: createCallRoute({ handleCall, clients, lanes, callCache, nowMs, workGate }),
|
|
118
|
+
workGate,
|
|
117
119
|
attachSse,
|
|
118
120
|
getStatus,
|
|
119
121
|
transportMemory: () => ({
|
|
@@ -20,6 +20,7 @@ import http from 'node:http';
|
|
|
20
20
|
import { randomUUID } from 'node:crypto';
|
|
21
21
|
import { createLoopbackListener } from '../runtime/shared/loopback-listener.mjs';
|
|
22
22
|
import { createTransportStack } from './session-transport/stack.mjs';
|
|
23
|
+
import { createWorkGate } from './daemon-work-gate.mjs';
|
|
23
24
|
|
|
24
25
|
export function createSessionTransport({
|
|
25
26
|
handleCall,
|
|
@@ -35,6 +36,9 @@ export function createSessionTransport({
|
|
|
35
36
|
// Asked before every register/call; false answers 503 (the daemon's owner
|
|
36
37
|
// lease is not held — daemon-owner.mjs).
|
|
37
38
|
admitWork = () => true,
|
|
39
|
+
// The daemon's one admission gate; an embedder without one gets its own,
|
|
40
|
+
// counting the status' busy sessions.
|
|
41
|
+
workGate = createWorkGate({ busy: () => Number(getStatus()?.busy) || 0 }),
|
|
38
42
|
} = {}) {
|
|
39
43
|
if (typeof handleCall !== 'function') throw new Error('handleCall is required');
|
|
40
44
|
|
|
@@ -55,6 +59,7 @@ export function createSessionTransport({
|
|
|
55
59
|
onClientDropped,
|
|
56
60
|
onUpgradeRequested,
|
|
57
61
|
getStatus,
|
|
62
|
+
workGate,
|
|
58
63
|
admitWork,
|
|
59
64
|
});
|
|
60
65
|
|
|
@@ -63,7 +63,7 @@ export function modelFooter(selection, model = null) {
|
|
|
63
63
|
return {
|
|
64
64
|
glyph: '◇',
|
|
65
65
|
color: theme.inactive,
|
|
66
|
-
text: `${parameter.label}: ${parameter.options?.find((option) => option.value === value)?.label || value} · T Toggle`,
|
|
66
|
+
text: `${parameter.label}: ${parameter.options?.find((option) => option.value === value)?.label || value} · ${parameter.id === 'providerSort' ? 'R Cycle' : 'T Toggle'}`,
|
|
67
67
|
};
|
|
68
68
|
});
|
|
69
69
|
if (!values.length)
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
// model-picker/provider-models-list.mjs
|
|
2
2
|
// One provider's model list: rows from the catalog, the footer for the
|
|
3
3
|
// highlighted row, and the keys that change its selections (←/→ effort,
|
|
4
|
-
// C/Shift+C context, Tab Fast, T thinking). Enter saves through the caller.
|
|
4
|
+
// C/Shift+C context, Tab Fast, T thinking, R OpenRouter routing). Enter saves through the caller.
|
|
5
5
|
import { buildProviderModelItems, resolveProviderDisplayName } from '../model-options.mjs';
|
|
6
6
|
import { modelFooter } from './model-footer.mjs';
|
|
7
7
|
import { createRouteSelection } from './route-selection.mjs';
|
|
8
8
|
|
|
9
|
-
const MODEL_LIST_HELP = '↑/↓ Select · ←/→ Effort · C/Shift+C Context · Tab Fast · T Thinking · Enter Save';
|
|
9
|
+
const MODEL_LIST_HELP = '↑/↓ Select · ←/→ Effort · C/Shift+C Context · Tab Fast · T Thinking · R Routing · Enter Save';
|
|
10
10
|
|
|
11
11
|
/** Saves the route for a caller-owned save (options.onSelectRoute) or through
|
|
12
12
|
* store.setRoute. The keypress owns the hop: the destination is painted and
|
|
@@ -98,11 +98,15 @@ export function openProviderModelsPicker({ view, provider, onBack, saveRoute })
|
|
|
98
98
|
},
|
|
99
99
|
onKey: (input, _key, item) => {
|
|
100
100
|
const model = item?._model;
|
|
101
|
-
if (!model || !['c', 'C', 't', 'T'].includes(input)) return;
|
|
101
|
+
if (!model || !['c', 'C', 't', 'T', 'r', 'R'].includes(input)) return;
|
|
102
102
|
if (input.toLowerCase() === 'c') {
|
|
103
103
|
if (selection.stepContext(model, input === 'C' ? -1 : 1)) render();
|
|
104
104
|
return;
|
|
105
105
|
}
|
|
106
|
+
if (input.toLowerCase() === 'r') {
|
|
107
|
+
if (selection.cycleRouting(model)) render();
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
106
110
|
if (selection.cycleThinking(model)) render();
|
|
107
111
|
},
|
|
108
112
|
onCancel: () => {
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
// invalidate a Fast selection that the new parameter combination rules out.
|
|
6
6
|
import { modelKey } from './model-key.mjs';
|
|
7
7
|
import { DAYBREAK_PARAMETER_ID } from '../../../../runtime/shared/llm/openai-daybreak.mjs';
|
|
8
|
+
import { OPENROUTER_SORT_PARAMETER } from '../../../../runtime/agent/orchestrator/providers/openrouter-provider-routing.mjs';
|
|
8
9
|
|
|
9
10
|
const TOGGLE_PARAMETER_IDS = new Set(['thinking', DAYBREAK_PARAMETER_ID]);
|
|
10
11
|
|
|
@@ -88,8 +89,7 @@ export function createFastParameterSelection({ state, currentRoute, isCurrentRou
|
|
|
88
89
|
/** Cycles the model's toggle parameter ('thinking', or Daybreak Blue's
|
|
89
90
|
* on/off) to its next option; false when the model has none. Fast is
|
|
90
91
|
* dropped when the new parameters rule it out. */
|
|
91
|
-
const
|
|
92
|
-
const definition = (model.modelParameterOptions || []).find((parameter) => TOGGLE_PARAMETER_IDS.has(parameter.id));
|
|
92
|
+
const cycleParameter = (model, definition) => {
|
|
93
93
|
if (!definition?.options?.length) return false;
|
|
94
94
|
const wanted = definition.id;
|
|
95
95
|
const parameters = modelParametersFor(model);
|
|
@@ -103,5 +103,25 @@ export function createFastParameterSelection({ state, currentRoute, isCurrentRou
|
|
|
103
103
|
return true;
|
|
104
104
|
};
|
|
105
105
|
|
|
106
|
-
|
|
106
|
+
const cycleThinking = (model) =>
|
|
107
|
+
cycleParameter(
|
|
108
|
+
model,
|
|
109
|
+
(model.modelParameterOptions || []).find((parameter) => TOGGLE_PARAMETER_IDS.has(parameter.id))
|
|
110
|
+
);
|
|
111
|
+
/** Cycles OpenRouter's Routing (Auto → Price → Speed → Latency); false on other rows. */
|
|
112
|
+
const cycleRouting = (model) =>
|
|
113
|
+
cycleParameter(
|
|
114
|
+
model,
|
|
115
|
+
(model.modelParameterOptions || []).find((parameter) => parameter.id === OPENROUTER_SORT_PARAMETER)
|
|
116
|
+
);
|
|
117
|
+
|
|
118
|
+
return {
|
|
119
|
+
modelParametersFor,
|
|
120
|
+
fastAvailableFor,
|
|
121
|
+
getSelectedFast,
|
|
122
|
+
isUltrafast,
|
|
123
|
+
toggleFast,
|
|
124
|
+
cycleThinking,
|
|
125
|
+
cycleRouting,
|
|
126
|
+
};
|
|
107
127
|
}
|