@adhdev/daemon-core 0.9.82-rc.33 → 0.9.82-rc.331
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/dist/boot/daemon-lifecycle.d.ts +8 -0
- package/dist/boot/process-hardening.d.ts +50 -0
- package/dist/build-info.d.ts +37 -0
- package/dist/chat/source-machine.d.ts +166 -0
- package/dist/chat/source-resolver.d.ts +104 -0
- package/dist/chat/subscription-updates.d.ts +1 -0
- package/dist/cli-adapter-types.d.ts +46 -2
- package/dist/cli-adapters/cli-script-runner.d.ts +117 -0
- package/dist/cli-adapters/cli-state-engine.d.ts +198 -0
- package/dist/cli-adapters/provider-cli-adapter.d.ts +115 -64
- package/dist/cli-adapters/provider-cli-parse.d.ts +4 -0
- package/dist/cli-adapters/provider-cli-runtime.d.ts +34 -0
- package/dist/cli-adapters/provider-cli-shared.d.ts +53 -0
- package/dist/cli-adapters/raw-terminal-io.d.ts +37 -0
- package/dist/cli-adapters/resolve-executable.d.ts +14 -0
- package/dist/cli-adapters/terminal-backends/ghostty-vt-backend.d.ts +6 -3
- package/dist/cli-adapters/terminal-backends/types.d.ts +10 -2
- package/dist/cli-adapters/terminal-screen.d.ts +4 -11
- package/dist/commands/cli-manager.d.ts +2 -1
- package/dist/commands/handler.d.ts +110 -0
- package/dist/commands/mesh-coordinator.d.ts +85 -1
- package/dist/commands/router.d.ts +279 -1
- package/dist/commands/upgrade-helper.d.ts +12 -0
- package/dist/config/chat-history.d.ts +9 -0
- package/dist/config/config.d.ts +5 -0
- package/dist/config/mesh-config.d.ts +77 -1
- package/dist/detection/ide-detector.d.ts +13 -0
- package/dist/detection/win32-ide-version.d.ts +37 -0
- package/dist/git/change-impact-config.d.ts +159 -0
- package/dist/git/git-commands.d.ts +11 -1
- package/dist/git/git-diff.d.ts +6 -0
- package/dist/git/git-executor.d.ts +11 -0
- package/dist/git/git-status.d.ts +23 -0
- package/dist/git/git-types.d.ts +2 -50
- package/dist/git/index.d.ts +2 -0
- package/dist/index.d.ts +51 -12
- package/dist/index.js +38419 -13805
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +41329 -16835
- package/dist/index.mjs.map +1 -1
- package/dist/installer.d.ts +1 -4
- package/dist/ipc/local-ipc-server.d.ts +91 -0
- package/dist/launch.d.ts +1 -1
- package/dist/logging/async-batch-writer.d.ts +10 -0
- package/dist/logging/log-redactor.d.ts +24 -0
- package/dist/logging/log-tail-reader.d.ts +46 -0
- package/dist/mesh/contracts.d.ts +164 -0
- package/dist/mesh/coordinator-prompt.d.ts +36 -0
- package/dist/mesh/coordinator-registry.d.ts +59 -0
- package/dist/mesh/mesh-active-work.d.ts +174 -0
- package/dist/mesh/mesh-delivery-policy.d.ts +131 -0
- package/dist/mesh/mesh-events-coordinator.d.ts +169 -0
- package/dist/mesh/mesh-events-pending.d.ts +45 -0
- package/dist/mesh/mesh-events-stale.d.ts +40 -0
- package/dist/mesh/mesh-events-utils.d.ts +47 -0
- package/dist/mesh/mesh-events.d.ts +6 -49
- package/dist/mesh/mesh-fast-forward.d.ts +81 -0
- package/dist/mesh/mesh-host-ownership.d.ts +9 -0
- package/dist/mesh/mesh-init.d.ts +86 -0
- package/dist/mesh/mesh-ledger-reconciliation.d.ts +23 -3
- package/dist/mesh/mesh-ledger.d.ts +77 -1
- package/dist/mesh/mesh-missions.d.ts +116 -0
- package/dist/mesh/mesh-reconcile-loop.d.ts +7 -0
- package/dist/mesh/mesh-refine-batch.d.ts +68 -0
- package/dist/mesh/mesh-refine-status.d.ts +62 -0
- package/dist/mesh/mesh-review-inbox.d.ts +90 -0
- package/dist/mesh/mesh-routing.d.ts +70 -0
- package/dist/mesh/mesh-runtime-store.d.ts +401 -0
- package/dist/mesh/mesh-task-stats.d.ts +49 -0
- package/dist/mesh/mesh-unresolved-forward-outbox.d.ts +30 -0
- package/dist/mesh/mesh-work-queue.d.ts +207 -5
- package/dist/mesh/preview-freshness.d.ts +18 -0
- package/dist/mesh/refine-config.d.ts +215 -0
- package/dist/mesh/worktree-bootstrap-config.d.ts +135 -0
- package/dist/providers/acp-provider-instance.d.ts +2 -0
- package/dist/providers/approval-utils.d.ts +13 -0
- package/dist/providers/chat-message-normalization.d.ts +12 -0
- package/dist/providers/cli-provider-instance.d.ts +61 -3
- package/dist/providers/contracts.d.ts +130 -6
- package/dist/providers/external-sources.d.ts +71 -0
- package/dist/providers/native-history/antigravity-cli-transcript.d.ts +100 -0
- package/dist/providers/native-history/claude-cli-transcript.d.ts +70 -0
- package/dist/providers/native-history/codex-cli-transcript.d.ts +73 -0
- package/dist/providers/native-history/dispatcher.d.ts +27 -0
- package/dist/providers/native-history/hermes-cli-transcript.d.ts +30 -0
- package/dist/providers/native-history/index.d.ts +13 -0
- package/dist/providers/provider-instance-manager.d.ts +13 -0
- package/dist/providers/provider-instance.d.ts +13 -1
- package/dist/providers/provider-loader.d.ts +26 -4
- package/dist/providers/provider-trust.d.ts +31 -0
- package/dist/providers/read-chat-contract.d.ts +29 -0
- package/dist/providers/sdk/v1/builders/acp/detect-status.d.ts +68 -0
- package/dist/providers/sdk/v1/builders/cli/detect-status.d.ts +85 -0
- package/dist/providers/sdk/v1/builders/cli/parse-approval-squash.d.ts +59 -0
- package/dist/providers/sdk/v1/builders/cli/parse-approval.d.ts +65 -0
- package/dist/providers/sdk/v1/builders/cli/parse-session.d.ts +91 -0
- package/dist/providers/sdk/v1/builders/cli/visible-region.d.ts +42 -0
- package/dist/providers/sdk/v1/fixture-tooling/format.d.ts +126 -0
- package/dist/providers/sdk/v1/fixture-tooling/index.d.ts +8 -0
- package/dist/providers/sdk/v1/fixture-tooling/replay.d.ts +38 -0
- package/dist/providers/sdk/v1/index.d.ts +30 -0
- package/dist/providers/sdk/v1/sandbox/README-design.d.ts +193 -0
- package/dist/providers/sdk/v1/sandbox/require-whitelist.d.ts +74 -0
- package/dist/providers/sdk/v1/sandbox/script-runner.d.ts +98 -0
- package/dist/providers/sdk/v1/types/cli/index.d.ts +277 -0
- package/dist/providers/sdk/v1/types/common/index.d.ts +203 -0
- package/dist/providers/sdk/v1/validators/index.d.ts +5 -0
- package/dist/providers/sdk/v1/validators/manifest.d.ts +40 -0
- package/dist/providers/sdk/v1/validators/taint.d.ts +52 -0
- package/dist/providers/spec/adapter.d.ts +69 -0
- package/dist/providers/spec/cli-adapter.d.ts +217 -0
- package/dist/providers/spec/evaluator.d.ts +23 -0
- package/dist/providers/spec/fsm-driver.d.ts +306 -0
- package/dist/providers/spec/fsm-evaluator.d.ts +72 -0
- package/dist/providers/spec/fsm-loader.d.ts +14 -0
- package/dist/providers/spec/fsm-types.d.ts +144 -0
- package/dist/providers/spec/native-history-executor.d.ts +41 -0
- package/dist/providers/spec/pre-launch-trust.d.ts +16 -0
- package/dist/providers/spec/route.d.ts +4 -0
- package/dist/providers/spec/types.d.ts +180 -0
- package/dist/providers/status-monitor.d.ts +7 -7
- package/dist/providers/transcript-v2.d.ts +176 -0
- package/dist/providers/types/interactive-prompt.d.ts +84 -0
- package/dist/providers/working-dir.d.ts +17 -0
- package/dist/repo-mesh-types.d.ts +295 -13
- package/dist/sessions/registry.d.ts +6 -0
- package/dist/shared-types-extra.d.ts +2 -4
- package/dist/shared-types.d.ts +52 -2
- package/dist/status/normalize.d.ts +1 -1
- package/dist/status/normalize.js +1 -0
- package/dist/status/normalize.js.map +1 -1
- package/dist/status/normalize.mjs +1 -0
- package/dist/status/normalize.mjs.map +1 -1
- package/dist/status/reporter.d.ts +2 -0
- package/dist/status/snapshot.d.ts +1 -0
- package/dist/types.d.ts +5 -0
- package/package.json +7 -3
- package/src/agent-stream/poller.ts +2 -3
- package/src/agent-stream/provider-adapter.ts +1 -1
- package/src/boot/daemon-lifecycle.ts +55 -12
- package/src/boot/process-hardening.ts +89 -0
- package/src/build-info.ts +73 -0
- package/src/chat/source-machine.ts +534 -0
- package/src/chat/source-resolver.ts +0 -0
- package/src/chat/subscription-updates.ts +20 -1
- package/src/cli-adapter-types.d.ts +1 -0
- package/src/cli-adapter-types.ts +47 -2
- package/src/cli-adapters/cli-script-runner.ts +421 -0
- package/src/cli-adapters/cli-state-engine.ts +1215 -0
- package/src/cli-adapters/provider-cli-adapter.d.ts +1 -1
- package/src/cli-adapters/provider-cli-adapter.ts +713 -1141
- package/src/cli-adapters/provider-cli-parse.d.ts +1 -0
- package/src/cli-adapters/provider-cli-parse.ts +13 -0
- package/src/cli-adapters/provider-cli-runtime.ts +56 -7
- package/src/cli-adapters/provider-cli-shared.d.ts +4 -0
- package/src/cli-adapters/provider-cli-shared.ts +100 -11
- package/src/cli-adapters/pty-transport.ts +2 -1
- package/src/cli-adapters/raw-terminal-io.ts +252 -0
- package/src/cli-adapters/resolve-executable.ts +90 -0
- package/src/cli-adapters/session-host-transport.ts +2 -1
- package/src/cli-adapters/terminal-backends/ghostty-vt-backend.ts +53 -29
- package/src/cli-adapters/terminal-backends/types.ts +10 -3
- package/src/cli-adapters/terminal-screen.ts +16 -81
- package/src/commands/chat-commands.ts +1823 -62
- package/src/commands/cli-manager.ts +286 -14
- package/src/commands/handler.ts +809 -2
- package/src/commands/mesh-coordinator.ts +332 -122
- package/src/commands/router.ts +7270 -1306
- package/src/commands/stream-commands.ts +8 -0
- package/src/commands/upgrade-helper.ts +81 -30
- package/src/config/chat-history.ts +483 -24
- package/src/config/config.ts +12 -0
- package/src/config/mesh-config.ts +388 -6
- package/src/config/recent-activity.ts +8 -2
- package/src/daemon/dev-auto-implement.ts +3 -2
- package/src/daemon/dev-cli-debug.ts +10 -1
- package/src/detection/cli-detector.ts +28 -9
- package/src/detection/ide-detector.ts +55 -16
- package/src/detection/win32-ide-version.ts +106 -0
- package/src/git/change-impact-config.ts +354 -0
- package/src/git/git-commands.ts +55 -14
- package/src/git/git-diff.ts +53 -0
- package/src/git/git-executor.ts +12 -0
- package/src/git/git-status.ts +574 -43
- package/src/git/git-types.ts +14 -62
- package/src/git/git-worktree.ts +8 -1
- package/src/git/index.ts +16 -0
- package/src/index.ts +145 -11
- package/src/installer.d.ts +1 -1
- package/src/installer.ts +8 -6
- package/src/ipc/local-ipc-server.ts +278 -0
- package/src/launch.d.ts +1 -1
- package/src/launch.ts +37 -28
- package/src/logging/async-batch-writer.ts +55 -0
- package/src/logging/log-redactor.ts +100 -0
- package/src/logging/log-tail-reader.ts +220 -0
- package/src/logging/logger.ts +2 -1
- package/src/mesh/contracts.ts +329 -0
- package/src/mesh/coordinator-prompt.ts +234 -31
- package/src/mesh/coordinator-registry.ts +121 -0
- package/src/mesh/mesh-active-work.ts +623 -0
- package/src/mesh/mesh-delivery-policy.ts +315 -0
- package/src/mesh/mesh-events-coordinator.ts +2110 -0
- package/src/mesh/mesh-events-pending.ts +508 -0
- package/src/mesh/mesh-events-stale.ts +290 -0
- package/src/mesh/mesh-events-utils.ts +254 -0
- package/src/mesh/mesh-events.ts +30 -1035
- package/src/mesh/mesh-fast-forward.ts +839 -0
- package/src/mesh/mesh-host-ownership.ts +73 -0
- package/src/mesh/mesh-init.ts +260 -0
- package/src/mesh/mesh-ledger-reconciliation.ts +12 -5
- package/src/mesh/mesh-ledger.ts +589 -102
- package/src/mesh/mesh-missions.ts +248 -0
- package/src/mesh/mesh-reconcile-loop.ts +786 -0
- package/src/mesh/mesh-refine-batch.ts +197 -0
- package/src/mesh/mesh-refine-status.ts +231 -0
- package/src/mesh/mesh-review-inbox.ts +307 -0
- package/src/mesh/mesh-routing.ts +291 -0
- package/src/mesh/mesh-runtime-store.ts +1578 -0
- package/src/mesh/mesh-task-stats.ts +154 -0
- package/src/mesh/mesh-unresolved-forward-outbox.ts +185 -0
- package/src/mesh/mesh-work-queue.ts +874 -141
- package/src/mesh/preview-freshness.ts +118 -0
- package/src/mesh/refine-config.ts +403 -0
- package/src/mesh/worktree-bootstrap-config.ts +326 -0
- package/src/providers/acp-provider-instance.ts +25 -9
- package/src/providers/approval-utils.d.ts +4 -0
- package/src/providers/approval-utils.ts +47 -5
- package/src/providers/chat-message-normalization.ts +45 -5
- package/src/providers/cli-provider-instance.ts +986 -99
- package/src/providers/contracts.d.ts +55 -0
- package/src/providers/contracts.ts +141 -6
- package/src/providers/extension-provider-instance.ts +12 -7
- package/src/providers/external-sources.ts +218 -0
- package/src/providers/ide-provider-instance.ts +35 -12
- package/src/providers/native-history/antigravity-cli-transcript.ts +643 -0
- package/src/providers/native-history/claude-cli-transcript.ts +396 -0
- package/src/providers/native-history/codex-cli-transcript.ts +479 -0
- package/src/providers/native-history/dispatcher.ts +340 -0
- package/src/providers/native-history/hermes-cli-transcript.ts +230 -0
- package/src/providers/native-history/index.ts +30 -0
- package/src/providers/provider-instance-manager.ts +30 -0
- package/src/providers/provider-instance.ts +10 -1
- package/src/providers/provider-loader.ts +662 -50
- package/src/providers/provider-schema.ts +87 -14
- package/src/providers/provider-trust.ts +114 -0
- package/src/providers/read-chat-contract.ts +76 -16
- package/src/providers/sdk/README.md +49 -0
- package/src/providers/sdk/v1/builders/acp/detect-status.ts +144 -0
- package/src/providers/sdk/v1/builders/cli/detect-status.ts +262 -0
- package/src/providers/sdk/v1/builders/cli/parse-approval-squash.ts +158 -0
- package/src/providers/sdk/v1/builders/cli/parse-approval.ts +250 -0
- package/src/providers/sdk/v1/builders/cli/parse-session.ts +276 -0
- package/src/providers/sdk/v1/builders/cli/visible-region.ts +143 -0
- package/src/providers/sdk/v1/fixture-tooling/format.ts +130 -0
- package/src/providers/sdk/v1/fixture-tooling/index.ts +22 -0
- package/src/providers/sdk/v1/fixture-tooling/replay.ts +352 -0
- package/src/providers/sdk/v1/index.ts +152 -0
- package/src/providers/sdk/v1/sandbox/README-design.ts +195 -0
- package/src/providers/sdk/v1/sandbox/require-whitelist.ts +472 -0
- package/src/providers/sdk/v1/sandbox/script-runner.ts +150 -0
- package/src/providers/sdk/v1/schemas/cli/provider.schema.json +504 -0
- package/src/providers/sdk/v1/schemas/primitives/acp-session-protocol-v1.json +131 -0
- package/src/providers/sdk/v1/schemas/primitives/native-history-codex-rollout-v1.json +66 -0
- package/src/providers/sdk/v1/schemas/primitives/tui-approval-squash-v1.json +91 -0
- package/src/providers/sdk/v1/schemas/primitives/tui-assistant-block-v1.json +91 -0
- package/src/providers/sdk/v1/schemas/primitives/tui-cue-ordering-v1.json +47 -0
- package/src/providers/sdk/v1/schemas/primitives/tui-dispatch-order-v1.json +32 -0
- package/src/providers/sdk/v1/schemas/primitives/tui-footer-chrome-v1.json +42 -0
- package/src/providers/sdk/v1/schemas/primitives/tui-index-finder-v1.json +27 -0
- package/src/providers/sdk/v1/schemas/primitives/tui-modal-v1.json +125 -0
- package/src/providers/sdk/v1/schemas/primitives/tui-prompt-marker-v1.json +45 -0
- package/src/providers/sdk/v1/schemas/primitives/tui-session-id-extraction-v1.json +46 -0
- package/src/providers/sdk/v1/schemas/primitives/tui-settled-prompt-v1.json +71 -0
- package/src/providers/sdk/v1/schemas/primitives/tui-spinner-v1.json +83 -0
- package/src/providers/sdk/v1/schemas/primitives/tui-transcript-pty-v1.json +83 -0
- package/src/providers/sdk/v1/schemas/primitives/tui-visible-region-v1.json +57 -0
- package/src/providers/sdk/v1/schemas/primitives/tui-welcome-screen-v1.json +35 -0
- package/src/providers/sdk/v1/types/cli/index.ts +365 -0
- package/src/providers/sdk/v1/types/common/index.ts +229 -0
- package/src/providers/sdk/v1/validators/index.ts +19 -0
- package/src/providers/sdk/v1/validators/manifest.ts +110 -0
- package/src/providers/sdk/v1/validators/taint.ts +309 -0
- package/src/providers/spec/adapter.ts +168 -0
- package/src/providers/spec/cli-adapter.ts +986 -0
- package/src/providers/spec/evaluator.ts +345 -0
- package/src/providers/spec/fsm-driver.ts +993 -0
- package/src/providers/spec/fsm-evaluator.ts +255 -0
- package/src/providers/spec/fsm-loader.ts +120 -0
- package/src/providers/spec/fsm-types.ts +238 -0
- package/src/providers/spec/native-history-executor.ts +1136 -0
- package/src/providers/spec/pre-launch-trust.ts +104 -0
- package/src/providers/spec/route.ts +51 -0
- package/src/providers/spec/types.ts +226 -0
- package/src/providers/status-monitor.d.ts +7 -7
- package/src/providers/status-monitor.ts +37 -22
- package/src/providers/transcript-v2.ts +567 -0
- package/src/providers/types/interactive-prompt.ts +536 -0
- package/src/providers/version-archive.ts +64 -24
- package/src/providers/working-dir.ts +23 -0
- package/src/repo-mesh-types.ts +378 -14
- package/src/sessions/registry.ts +6 -0
- package/src/shared-types-extra.ts +2 -4
- package/src/shared-types.d.ts +8 -0
- package/src/shared-types.ts +57 -1
- package/src/status/builders.ts +26 -6
- package/src/status/normalize.ts +2 -0
- package/src/status/reporter.ts +19 -1
- package/src/status/snapshot.ts +84 -25
- package/src/system/host-memory.ts +29 -12
- package/src/types.ts +5 -0
- package/dist/cli-adapters/terminal-backends/xterm-backend.d.ts +0 -17
- package/dist/mesh/mesh-sync.d.ts +0 -53
- package/src/cli-adapters/terminal-backends/ghostty-vt-backend.d.ts +0 -16
- package/src/cli-adapters/terminal-backends/xterm-backend.ts +0 -97
- package/src/mesh/mesh-sync.ts +0 -111
package/src/shared-types.ts
CHANGED
|
@@ -56,6 +56,7 @@ import type {
|
|
|
56
56
|
GitWorkspaceUpdate,
|
|
57
57
|
WorkspaceGitSubscriptionParams,
|
|
58
58
|
} from './git/git-types.js';
|
|
59
|
+
import type { InteractivePrompt } from './providers/types/interactive-prompt.js';
|
|
59
60
|
|
|
60
61
|
export type {
|
|
61
62
|
GitCommandName,
|
|
@@ -110,6 +111,14 @@ export interface ReadChatSyncResult {
|
|
|
110
111
|
status: string;
|
|
111
112
|
title?: string;
|
|
112
113
|
activeModal?: { message: string; buttons: string[] } | null;
|
|
114
|
+
activeInteractivePrompt?: InteractivePrompt | null;
|
|
115
|
+
/**
|
|
116
|
+
* Chat source provenance from ChatSourceMachine (A2). Carries the
|
|
117
|
+
* selected source, transition cause, lock state, and legacy
|
|
118
|
+
* fallbackReason — opaque to the daemon-core, consumed by web-core
|
|
119
|
+
* for the source debug badge and SourceTimeline (A3).
|
|
120
|
+
*/
|
|
121
|
+
messageSource?: Record<string, unknown>;
|
|
113
122
|
}
|
|
114
123
|
|
|
115
124
|
export interface ProviderSummaryItem {
|
|
@@ -365,6 +374,7 @@ export interface SessionEntry {
|
|
|
365
374
|
runtimeRecoveryState?: string | null;
|
|
366
375
|
resume?: ProviderResumeCapability;
|
|
367
376
|
activeChat: SessionActiveChatData | null;
|
|
377
|
+
activeInteractivePrompt?: InteractivePrompt | null;
|
|
368
378
|
capabilities?: SessionCapability[];
|
|
369
379
|
/** Effective message input/media support for this session. Defaults fail-closed to text-only. */
|
|
370
380
|
messageInput?: MessageInputSupport;
|
|
@@ -389,6 +399,17 @@ export interface SessionEntry {
|
|
|
389
399
|
seenCompletionMarker?: string;
|
|
390
400
|
surfaceHidden?: boolean;
|
|
391
401
|
settings?: Record<string, any>;
|
|
402
|
+
/**
|
|
403
|
+
* True owning-daemon id for a session a coordinator synthesises into its own
|
|
404
|
+
* status snapshot (mesh delegated sessions). The dashboard attributes the session
|
|
405
|
+
* to this daemon instead of the snapshot daemon so the worker node — not the
|
|
406
|
+
* coordinator — is shown as its machine.
|
|
407
|
+
*/
|
|
408
|
+
ownerDaemonId?: string;
|
|
409
|
+
/** True owning-machine display name fallback when the owning daemon is not aggregated. */
|
|
410
|
+
ownerMachineName?: string;
|
|
411
|
+
/** Set when this session is acting as a mesh coordinator for the given mesh. */
|
|
412
|
+
coordinator?: { meshId: string; role: 'coordinator' };
|
|
392
413
|
meshQueueStats?: {
|
|
393
414
|
total?: number;
|
|
394
415
|
active?: number;
|
|
@@ -516,7 +537,39 @@ export interface AvailableProviderInfo {
|
|
|
516
537
|
lastVerification?: MachineProviderCheckResult;
|
|
517
538
|
/** Provider-declared Repo Mesh coordinator/MCP behavior. */
|
|
518
539
|
meshCoordinator?: ProviderMeshCoordinatorConfig;
|
|
519
|
-
|
|
540
|
+
/**
|
|
541
|
+
* Provider trust classification — derived from the on-disk layer the
|
|
542
|
+
* manifest came from and the shape of the manifest. Dashboards use
|
|
543
|
+
* this to render a trust badge and gate activation of
|
|
544
|
+
* `external-untrusted` providers behind a confirm modal.
|
|
545
|
+
*/
|
|
546
|
+
trust?: ProviderTrust;
|
|
547
|
+
/** Daemon-side human-readable description of the trust value. */
|
|
548
|
+
trustDescription?: string;
|
|
549
|
+
/** True when activation needs a user-side confirmation step. */
|
|
550
|
+
requiresConfirmation?: boolean;
|
|
551
|
+
/** Which on-disk layer the manifest lives in. */
|
|
552
|
+
sourceLayer?: 'user' | 'upstream' | 'external';
|
|
553
|
+
/** For external providers, the source-name namespace it came from. */
|
|
554
|
+
sourceName?: string | null;
|
|
555
|
+
/** Manifest-declared version, e.g. "1.2.1". */
|
|
556
|
+
providerVersion?: string;
|
|
557
|
+
/** Underlying executable name (CLI/binary providers). */
|
|
558
|
+
binary?: string;
|
|
559
|
+
/** Lifecycle label from the manifest: "Stable", "Beta", … */
|
|
560
|
+
status?: string;
|
|
561
|
+
/** One-line provider description from the manifest. */
|
|
562
|
+
details?: string;
|
|
563
|
+
/** Manifest-declared links: homepage, docs, repo, … */
|
|
564
|
+
links?: Record<string, string>;
|
|
565
|
+
}
|
|
566
|
+
|
|
567
|
+
export type ProviderTrust =
|
|
568
|
+
| 'user-custom'
|
|
569
|
+
| 'trusted'
|
|
570
|
+
| 'trusted-with-scripts'
|
|
571
|
+
| 'external-safe'
|
|
572
|
+
| 'external-untrusted';
|
|
520
573
|
|
|
521
574
|
export interface MachineProviderCheckResult {
|
|
522
575
|
ok: boolean;
|
|
@@ -687,6 +740,9 @@ export type DaemonStatusEventName =
|
|
|
687
740
|
| 'agent:waiting_approval'
|
|
688
741
|
| 'agent:generating_completed'
|
|
689
742
|
| 'agent:stopped'
|
|
743
|
+
| 'monitor:no_progress'
|
|
744
|
+
// Legacy alias for 'monitor:no_progress' — kept so older daemons that still
|
|
745
|
+
// emit it remain type-compatible with consumers during rollout.
|
|
690
746
|
| 'monitor:long_generating';
|
|
691
747
|
|
|
692
748
|
/** Minimal daemon-originated event payload relayed through the server. */
|
package/src/status/builders.ts
CHANGED
|
@@ -25,6 +25,7 @@ import {
|
|
|
25
25
|
type NormalizeActiveChatOptions,
|
|
26
26
|
} from './normalize.js';
|
|
27
27
|
import { getMeshQueueStats } from '../mesh/mesh-work-queue.js';
|
|
28
|
+
import { getCoordinatorForSession } from '../mesh/coordinator-registry.js';
|
|
28
29
|
import { normalizeProviderStateControlValues } from '../providers/provider-patch-state.js';
|
|
29
30
|
import { normalizeProviderSummaryMetadata } from '../providers/summary-metadata.js';
|
|
30
31
|
import {
|
|
@@ -164,7 +165,7 @@ const ACP_SESSION_CAPABILITIES: SessionCapability[] = [
|
|
|
164
165
|
'set_thought_level',
|
|
165
166
|
];
|
|
166
167
|
|
|
167
|
-
function
|
|
168
|
+
function buildWorkspaceSession(
|
|
168
169
|
state: IdeProviderState,
|
|
169
170
|
cdpManagers: Map<string, DaemonCdpManager>,
|
|
170
171
|
options: SessionEntryBuildOptions,
|
|
@@ -179,7 +180,10 @@ function buildIdeWorkspaceSession(
|
|
|
179
180
|
const git = getGitSummaryForWorkspace(workspace, options);
|
|
180
181
|
const title = activeChat?.title || state.name;
|
|
181
182
|
const meshCoordinatorFor = state.settings?.meshCoordinatorFor as string | undefined;
|
|
182
|
-
const
|
|
183
|
+
const registryEntry = state.instanceId ? getCoordinatorForSession(state.instanceId) : undefined;
|
|
184
|
+
const effectiveMeshId = meshCoordinatorFor || registryEntry?.meshId;
|
|
185
|
+
const coordinator = effectiveMeshId ? { meshId: effectiveMeshId, role: 'coordinator' as const } : undefined;
|
|
186
|
+
const meshQueueStats = effectiveMeshId ? getMeshQueueStats(effectiveMeshId) : undefined;
|
|
183
187
|
return {
|
|
184
188
|
id: state.instanceId || state.type,
|
|
185
189
|
parentId: null,
|
|
@@ -203,6 +207,7 @@ function buildIdeWorkspaceSession(
|
|
|
203
207
|
errorReason: state.errorReason,
|
|
204
208
|
lastUpdated: state.lastUpdated,
|
|
205
209
|
settings: state.settings,
|
|
210
|
+
...(coordinator && { coordinator }),
|
|
206
211
|
...(meshQueueStats && { meshQueueStats }),
|
|
207
212
|
};
|
|
208
213
|
}
|
|
@@ -221,7 +226,10 @@ function buildExtensionAgentSession(
|
|
|
221
226
|
const workspace = parent.workspace || null;
|
|
222
227
|
const git = getGitSummaryForWorkspace(workspace, options);
|
|
223
228
|
const meshCoordinatorFor = ext.settings?.meshCoordinatorFor as string | undefined;
|
|
224
|
-
const
|
|
229
|
+
const registryEntry = ext.instanceId ? getCoordinatorForSession(ext.instanceId) : undefined;
|
|
230
|
+
const effectiveMeshId = meshCoordinatorFor || registryEntry?.meshId;
|
|
231
|
+
const coordinator = effectiveMeshId ? { meshId: effectiveMeshId, role: 'coordinator' as const } : undefined;
|
|
232
|
+
const meshQueueStats = effectiveMeshId ? getMeshQueueStats(effectiveMeshId) : undefined;
|
|
225
233
|
return {
|
|
226
234
|
id: ext.instanceId || `${parent.instanceId}:${ext.type}`,
|
|
227
235
|
parentId: parent.instanceId || parent.type,
|
|
@@ -245,6 +253,7 @@ function buildExtensionAgentSession(
|
|
|
245
253
|
errorReason: ext.errorReason,
|
|
246
254
|
lastUpdated: ext.lastUpdated,
|
|
247
255
|
settings: ext.settings,
|
|
256
|
+
...(coordinator && { coordinator }),
|
|
248
257
|
...(meshQueueStats && { meshQueueStats }),
|
|
249
258
|
};
|
|
250
259
|
}
|
|
@@ -287,7 +296,10 @@ function buildCliSession(state: CliProviderState, options: SessionEntryBuildOpti
|
|
|
287
296
|
const workspace = state.workspace || null;
|
|
288
297
|
const git = getGitSummaryForWorkspace(workspace, options);
|
|
289
298
|
const meshCoordinatorFor = state.settings?.meshCoordinatorFor as string | undefined;
|
|
290
|
-
const
|
|
299
|
+
const registryEntry = state.instanceId ? getCoordinatorForSession(state.instanceId) : undefined;
|
|
300
|
+
const effectiveMeshId = meshCoordinatorFor || registryEntry?.meshId;
|
|
301
|
+
const coordinator = effectiveMeshId ? { meshId: effectiveMeshId, role: 'coordinator' as const } : undefined;
|
|
302
|
+
const meshQueueStats = effectiveMeshId ? getMeshQueueStats(effectiveMeshId) : undefined;
|
|
291
303
|
return {
|
|
292
304
|
id: state.instanceId,
|
|
293
305
|
parentId: null,
|
|
@@ -314,6 +326,7 @@ function buildCliSession(state: CliProviderState, options: SessionEntryBuildOpti
|
|
|
314
326
|
mode: state.mode,
|
|
315
327
|
resume: state.resume,
|
|
316
328
|
activeChat,
|
|
329
|
+
activeInteractivePrompt: state.activeInteractivePrompt ?? null,
|
|
317
330
|
...(summaryMetadata && { summaryMetadata }),
|
|
318
331
|
...(includeSessionMetadata && {
|
|
319
332
|
capabilities: state.mode === 'terminal' ? PTY_SESSION_CAPABILITIES : CLI_CHAT_SESSION_CAPABILITIES,
|
|
@@ -327,7 +340,9 @@ function buildCliSession(state: CliProviderState, options: SessionEntryBuildOpti
|
|
|
327
340
|
errorReason: state.errorReason,
|
|
328
341
|
lastUpdated: state.lastUpdated,
|
|
329
342
|
settings: state.settings,
|
|
343
|
+
...(coordinator && { coordinator }),
|
|
330
344
|
...(meshQueueStats && { meshQueueStats }),
|
|
345
|
+
...(state.settings?.spawnedSessionVisibility === 'hidden' && { surfaceHidden: true }),
|
|
331
346
|
};
|
|
332
347
|
}
|
|
333
348
|
|
|
@@ -341,7 +356,10 @@ function buildAcpSession(state: AcpProviderState, options: SessionEntryBuildOpti
|
|
|
341
356
|
const workspace = state.workspace || null;
|
|
342
357
|
const git = getGitSummaryForWorkspace(workspace, options);
|
|
343
358
|
const meshCoordinatorFor = state.settings?.meshCoordinatorFor as string | undefined;
|
|
344
|
-
const
|
|
359
|
+
const registryEntry = state.instanceId ? getCoordinatorForSession(state.instanceId) : undefined;
|
|
360
|
+
const effectiveMeshId = meshCoordinatorFor || registryEntry?.meshId;
|
|
361
|
+
const coordinator = effectiveMeshId ? { meshId: effectiveMeshId, role: 'coordinator' as const } : undefined;
|
|
362
|
+
const meshQueueStats = effectiveMeshId ? getMeshQueueStats(effectiveMeshId) : undefined;
|
|
345
363
|
return {
|
|
346
364
|
id: state.instanceId,
|
|
347
365
|
parentId: null,
|
|
@@ -364,7 +382,9 @@ function buildAcpSession(state: AcpProviderState, options: SessionEntryBuildOpti
|
|
|
364
382
|
errorReason: state.errorReason,
|
|
365
383
|
lastUpdated: state.lastUpdated,
|
|
366
384
|
settings: state.settings,
|
|
385
|
+
...(coordinator && { coordinator }),
|
|
367
386
|
...(meshQueueStats && { meshQueueStats }),
|
|
387
|
+
...(state.settings?.spawnedSessionVisibility === 'hidden' && { surfaceHidden: true }),
|
|
368
388
|
};
|
|
369
389
|
}
|
|
370
390
|
|
|
@@ -380,7 +400,7 @@ export function buildSessionEntries(
|
|
|
380
400
|
const acpStates = allStates.filter((s): s is AcpProviderState => s.category === 'acp');
|
|
381
401
|
|
|
382
402
|
for (const state of ideStates) {
|
|
383
|
-
sessions.push(
|
|
403
|
+
sessions.push(buildWorkspaceSession(state, cdpManagers, options));
|
|
384
404
|
for (const ext of state.extensions as ExtensionProviderState[]) {
|
|
385
405
|
if (!shouldIncludeExtensionSession(ext)) continue;
|
|
386
406
|
sessions.push(buildExtensionAgentSession(state, ext, options));
|
package/src/status/normalize.ts
CHANGED
|
@@ -5,6 +5,7 @@ export type ManagedStatus =
|
|
|
5
5
|
| 'idle'
|
|
6
6
|
| 'generating'
|
|
7
7
|
| 'waiting_approval'
|
|
8
|
+
| 'waiting_choice'
|
|
8
9
|
| 'error'
|
|
9
10
|
| 'stopped'
|
|
10
11
|
| 'starting'
|
|
@@ -151,6 +152,7 @@ export function normalizeManagedStatus(
|
|
|
151
152
|
|
|
152
153
|
const normalized = String(status || 'idle').trim().toLowerCase();
|
|
153
154
|
if (normalized === 'waiting_approval') return 'waiting_approval';
|
|
155
|
+
if (normalized === 'waiting_choice') return 'waiting_choice';
|
|
154
156
|
if (WORKING_STATUSES.has(normalized)) return 'generating';
|
|
155
157
|
if (normalized === 'error') return 'error';
|
|
156
158
|
if (normalized === 'stopped') return 'stopped';
|
package/src/status/reporter.ts
CHANGED
|
@@ -51,6 +51,8 @@ export class DaemonStatusReporter {
|
|
|
51
51
|
private lastStatusSentAt = 0;
|
|
52
52
|
private statusPendingThrottle = false;
|
|
53
53
|
private lastP2PStatusHash = '';
|
|
54
|
+
private lastP2PStatusSentAt: number = 0;
|
|
55
|
+
private p2pDebounceTimer: ReturnType<typeof setTimeout> | null = null;
|
|
54
56
|
private lastServerStatusHash = '';
|
|
55
57
|
private lastStatusSummary = '';
|
|
56
58
|
|
|
@@ -118,7 +120,7 @@ export class DaemonStatusReporter {
|
|
|
118
120
|
case 'agent:waiting_approval':
|
|
119
121
|
case 'agent:generating_completed':
|
|
120
122
|
case 'agent:stopped':
|
|
121
|
-
case 'monitor:
|
|
123
|
+
case 'monitor:no_progress':
|
|
122
124
|
return value;
|
|
123
125
|
default:
|
|
124
126
|
return null;
|
|
@@ -317,6 +319,9 @@ export class DaemonStatusReporter {
|
|
|
317
319
|
cdpConnected: session.cdpConnected,
|
|
318
320
|
summaryMetadata: session.summaryMetadata,
|
|
319
321
|
settings: session.settings,
|
|
322
|
+
// Forward surfaceHidden so the server can gate push notifications for
|
|
323
|
+
// coordinator-hidden sessions (the WS path is the only one the server sees).
|
|
324
|
+
surfaceHidden: session.surfaceHidden,
|
|
320
325
|
})),
|
|
321
326
|
p2p: payload.p2p,
|
|
322
327
|
timestamp: now,
|
|
@@ -355,7 +360,20 @@ export class DaemonStatusReporter {
|
|
|
355
360
|
: { ...hashTarget, sessions };
|
|
356
361
|
const h = this.simpleHash(JSON.stringify(hashPayload));
|
|
357
362
|
if (h !== this.lastP2PStatusHash) {
|
|
363
|
+
const now = Date.now();
|
|
364
|
+
// Rate limit: max 1 per 500ms
|
|
365
|
+
if (this.lastP2PStatusSentAt && now - this.lastP2PStatusSentAt < 500) {
|
|
366
|
+
if (!this.p2pDebounceTimer) {
|
|
367
|
+
this.p2pDebounceTimer = setTimeout(() => {
|
|
368
|
+
this.p2pDebounceTimer = null;
|
|
369
|
+
this.sendUnifiedStatusReport({ reason: 'p2p_debounce' });
|
|
370
|
+
}, 500);
|
|
371
|
+
}
|
|
372
|
+
return false; // Dropped for now, but will trigger later
|
|
373
|
+
}
|
|
374
|
+
|
|
358
375
|
this.lastP2PStatusHash = h;
|
|
376
|
+
this.lastP2PStatusSentAt = now;
|
|
359
377
|
this.deps.p2p?.sendStatus(payload);
|
|
360
378
|
return true;
|
|
361
379
|
}
|
package/src/status/snapshot.ts
CHANGED
|
@@ -145,21 +145,56 @@ function buildAvailableProviders(
|
|
|
145
145
|
lastDetection?: AvailableProviderInfo['lastDetection'];
|
|
146
146
|
lastVerification?: AvailableProviderInfo['lastVerification'];
|
|
147
147
|
meshCoordinator?: AvailableProviderInfo['meshCoordinator'];
|
|
148
|
+
_sourceTrust?: AvailableProviderInfo['trust'];
|
|
149
|
+
_sourceLayer?: AvailableProviderInfo['sourceLayer'];
|
|
150
|
+
_sourceName?: string | null;
|
|
151
|
+
providerVersion?: string;
|
|
152
|
+
binary?: string;
|
|
153
|
+
status?: string;
|
|
154
|
+
details?: string;
|
|
155
|
+
links?: Record<string, string>;
|
|
148
156
|
}> = providerLoader.getAvailableProviderInfos?.() || providerLoader.getAll();
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
157
|
+
// Trust helpers come from daemon-core; resolve them lazily so the
|
|
158
|
+
// status snapshot path stays loadable in older bundles that don't
|
|
159
|
+
// ship provider-trust yet.
|
|
160
|
+
let describeTrust: (trust: AvailableProviderInfo['trust']) => string = () => '';
|
|
161
|
+
let requiresConfirmation: (trust: AvailableProviderInfo['trust']) => boolean = () => false;
|
|
162
|
+
try {
|
|
163
|
+
const mod = require('../providers/provider-trust.js') as typeof import('../providers/provider-trust.js');
|
|
164
|
+
describeTrust = mod.describeTrust as typeof describeTrust;
|
|
165
|
+
requiresConfirmation = mod.requiresConfirmation as typeof requiresConfirmation;
|
|
166
|
+
} catch { /* enrichment only */ }
|
|
167
|
+
return providers.map((provider) => {
|
|
168
|
+
const trust = (provider as any)._sourceTrust as AvailableProviderInfo['trust'] | undefined;
|
|
169
|
+
const sourceLayer = (provider as any)._sourceLayer as AvailableProviderInfo['sourceLayer'] | undefined;
|
|
170
|
+
const sourceName = (provider as any)._sourceName as string | null | undefined;
|
|
171
|
+
return {
|
|
172
|
+
type: provider.type,
|
|
173
|
+
name: provider.displayName || provider.type,
|
|
174
|
+
displayName: provider.displayName || provider.type,
|
|
175
|
+
icon: provider.icon || '💻',
|
|
176
|
+
category: provider.category,
|
|
177
|
+
...(provider.installed !== undefined ? { installed: provider.installed } : {}),
|
|
178
|
+
...(provider.detectedPath !== undefined ? { detectedPath: provider.detectedPath } : {}),
|
|
179
|
+
...(provider.enabled !== undefined ? { enabled: provider.enabled } : {}),
|
|
180
|
+
...(provider.machineStatus !== undefined ? { machineStatus: provider.machineStatus } : {}),
|
|
181
|
+
...(provider.lastDetection !== undefined ? { lastDetection: provider.lastDetection } : {}),
|
|
182
|
+
...(provider.lastVerification !== undefined ? { lastVerification: provider.lastVerification } : {}),
|
|
183
|
+
...(provider.meshCoordinator !== undefined ? { meshCoordinator: provider.meshCoordinator } : {}),
|
|
184
|
+
...(trust ? {
|
|
185
|
+
trust,
|
|
186
|
+
trustDescription: describeTrust(trust),
|
|
187
|
+
requiresConfirmation: requiresConfirmation(trust),
|
|
188
|
+
} : {}),
|
|
189
|
+
...(sourceLayer ? { sourceLayer } : {}),
|
|
190
|
+
...(sourceName ? { sourceName } : {}),
|
|
191
|
+
...(provider.providerVersion ? { providerVersion: provider.providerVersion } : {}),
|
|
192
|
+
...(provider.binary ? { binary: provider.binary } : {}),
|
|
193
|
+
...(provider.status ? { status: provider.status } : {}),
|
|
194
|
+
...(provider.details ? { details: provider.details } : {}),
|
|
195
|
+
...(provider.links ? { links: provider.links } : {}),
|
|
196
|
+
};
|
|
197
|
+
});
|
|
163
198
|
}
|
|
164
199
|
|
|
165
200
|
export function buildMachineInfo(profile: 'full' | 'live' | 'metadata' = 'full'): MachineInfo {
|
|
@@ -297,18 +332,30 @@ export function getSessionCompletionMarker(session: {
|
|
|
297
332
|
receivedAt?: number | string;
|
|
298
333
|
timestamp?: number | string;
|
|
299
334
|
_turnKey?: string;
|
|
335
|
+
kind?: string;
|
|
300
336
|
}> | null
|
|
301
337
|
} | null
|
|
302
338
|
}) {
|
|
303
|
-
const
|
|
304
|
-
if (!
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
339
|
+
const messages = session.activeChat?.messages;
|
|
340
|
+
if (!Array.isArray(messages) || messages.length === 0) return '';
|
|
341
|
+
// Walk backwards until we find an assistant message that's not a tool call,
|
|
342
|
+
// or a user/human message (which ends the turn). System messages and tool
|
|
343
|
+
// messages don't gate "task completion" — they can't be acknowledged
|
|
344
|
+
// independently and rotate too aggressively for marker-based bell clearing.
|
|
345
|
+
for (let i = messages.length - 1; i >= 0; i -= 1) {
|
|
346
|
+
const m = messages[i];
|
|
347
|
+
const role = typeof m?.role === 'string' ? m.role : '';
|
|
348
|
+
const kind = typeof m?.kind === 'string' ? m.kind : '';
|
|
349
|
+
if (role === 'user' || role === 'human') return '';
|
|
350
|
+
if (role === 'system') continue;
|
|
351
|
+
if (kind === 'tool') continue;
|
|
352
|
+
if (typeof m._turnKey === 'string' && m._turnKey) return `turn:${m._turnKey}`;
|
|
353
|
+
if (typeof m.id === 'string' && m.id) return `id:${m.id}`;
|
|
354
|
+
if (typeof m.index === 'number' && Number.isFinite(m.index)) return `idx:${m.index}`;
|
|
355
|
+
const timestamp = getMessageEventTime(m);
|
|
356
|
+
return timestamp > 0 ? `ts:${timestamp}` : '';
|
|
357
|
+
}
|
|
358
|
+
return '';
|
|
312
359
|
}
|
|
313
360
|
|
|
314
361
|
function getSessionLastUsedAt(session: {
|
|
@@ -347,9 +394,21 @@ function getUnreadState(
|
|
|
347
394
|
if (status === 'generating' || status === 'starting') {
|
|
348
395
|
return { unread: false, inboxBucket: 'working' };
|
|
349
396
|
}
|
|
397
|
+
// Read-state resolution:
|
|
398
|
+
// - When provider supplies a `completionMarker`, prefer marker-equality.
|
|
399
|
+
// But if `seenCompletionMarker` hasn't been recorded yet (legacy/transition
|
|
400
|
+
// case), fall back to timestamp comparison so a stale marker doesn't keep
|
|
401
|
+
// the bell lit after the user already viewed the conversation.
|
|
402
|
+
// - When there is no completionMarker, use timestamp + role guard.
|
|
403
|
+
// - Trailing `assistant.tool` turns no longer count as unread on their own
|
|
404
|
+
// — the human can't acknowledge a tool call separately from the answer,
|
|
405
|
+
// so they'd be stuck with a perpetually unread badge.
|
|
406
|
+
const ignorableTrailingRoles = lastRole === 'user' || lastRole === 'human' || lastRole === 'system' || lastRole === 'tool';
|
|
350
407
|
const unread = completionMarker
|
|
351
|
-
?
|
|
352
|
-
|
|
408
|
+
? (seenCompletionMarker
|
|
409
|
+
? completionMarker !== seenCompletionMarker
|
|
410
|
+
: hasContentChange && lastUsedAt > lastSeenAt && !ignorableTrailingRoles)
|
|
411
|
+
: hasContentChange && lastUsedAt > lastSeenAt && !ignorableTrailingRoles;
|
|
353
412
|
return { unread, inboxBucket: unread ? 'task_complete' : 'idle' };
|
|
354
413
|
}
|
|
355
414
|
|
|
@@ -11,7 +11,10 @@
|
|
|
11
11
|
*/
|
|
12
12
|
|
|
13
13
|
import * as os from 'os';
|
|
14
|
-
import {
|
|
14
|
+
import { exec } from 'child_process';
|
|
15
|
+
import { promisify } from 'util';
|
|
16
|
+
|
|
17
|
+
const execAsync = promisify(exec);
|
|
15
18
|
|
|
16
19
|
export interface HostMemorySnapshot {
|
|
17
20
|
totalMem: number;
|
|
@@ -21,19 +24,22 @@ export interface HostMemorySnapshot {
|
|
|
21
24
|
availableMem: number;
|
|
22
25
|
}
|
|
23
26
|
|
|
24
|
-
|
|
25
|
-
|
|
27
|
+
let cachedDarwinAvail: number | null = null;
|
|
28
|
+
let darwinMemoryInterval: NodeJS.Timeout | null = null;
|
|
29
|
+
|
|
30
|
+
async function updateDarwinMemoryCache() {
|
|
31
|
+
if (os.platform() !== 'darwin') return;
|
|
26
32
|
try {
|
|
27
|
-
const
|
|
33
|
+
const { stdout } = await execAsync('vm_stat', {
|
|
28
34
|
encoding: 'utf-8',
|
|
29
35
|
timeout: 4000,
|
|
30
36
|
maxBuffer: 256 * 1024,
|
|
31
37
|
});
|
|
32
|
-
const pageSizeMatch =
|
|
38
|
+
const pageSizeMatch = stdout.match(/page size of (\d+)\s*bytes/i);
|
|
33
39
|
const pageSize = pageSizeMatch ? parseInt(pageSizeMatch[1], 10) : 4096;
|
|
34
40
|
|
|
35
41
|
const counts: Record<string, number> = {};
|
|
36
|
-
for (const line of
|
|
42
|
+
for (const line of stdout.split('\n')) {
|
|
37
43
|
const m = line.match(/^\s*Pages\s+([^:]+):\s+([\d,]+)\s*\.?/);
|
|
38
44
|
if (!m) continue;
|
|
39
45
|
const key = m[1].trim().toLowerCase().replace(/\s+/g, '_');
|
|
@@ -49,17 +55,28 @@ function parseDarwinAvailableBytes(totalMem: number): number | null {
|
|
|
49
55
|
|
|
50
56
|
const availPages = free + inactive + speculative + purgeable + fileBacked;
|
|
51
57
|
const bytes = availPages * pageSize;
|
|
52
|
-
|
|
53
|
-
return Math.min(bytes, totalMem);
|
|
58
|
+
cachedDarwinAvail = Number.isFinite(bytes) && bytes >= 0 ? Math.min(bytes, os.totalmem()) : null;
|
|
54
59
|
} catch {
|
|
55
|
-
|
|
60
|
+
// silently fallback
|
|
56
61
|
}
|
|
57
62
|
}
|
|
58
63
|
|
|
59
64
|
export function getHostMemorySnapshot(): HostMemorySnapshot {
|
|
65
|
+
if (os.platform() === 'darwin' && !darwinMemoryInterval) {
|
|
66
|
+
updateDarwinMemoryCache();
|
|
67
|
+
darwinMemoryInterval = setInterval(updateDarwinMemoryCache, 3000);
|
|
68
|
+
darwinMemoryInterval.unref();
|
|
69
|
+
}
|
|
70
|
+
|
|
60
71
|
const totalMem = os.totalmem();
|
|
61
72
|
const freeMem = os.freemem();
|
|
62
|
-
const
|
|
63
|
-
|
|
64
|
-
|
|
73
|
+
const availableMem = os.platform() === 'darwin'
|
|
74
|
+
? (cachedDarwinAvail ?? freeMem)
|
|
75
|
+
: freeMem;
|
|
76
|
+
|
|
77
|
+
return {
|
|
78
|
+
totalMem,
|
|
79
|
+
freeMem,
|
|
80
|
+
availableMem,
|
|
81
|
+
};
|
|
65
82
|
}
|
package/src/types.ts
CHANGED
|
@@ -43,6 +43,11 @@ export interface ChatMessage {
|
|
|
43
43
|
index?: number;
|
|
44
44
|
timestamp?: number;
|
|
45
45
|
receivedAt?: number;
|
|
46
|
+
/** (A2.3) Monotonic sequence number per (session, source). Producer-asserted
|
|
47
|
+
* when emitted by v2-aware providers (transcript v2 schema); otherwise
|
|
48
|
+
* derived by the daemon from receivedAt/timestamp/index. ChatSourceMachine
|
|
49
|
+
* uses this as the native peak watermark for regression detection. */
|
|
50
|
+
sequence?: number;
|
|
46
51
|
_turnKey?: string;
|
|
47
52
|
/** Tool calls associated with this message */
|
|
48
53
|
toolCalls?: ToolCallInfo[];
|
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
import type { TerminalViewportBackend, TerminalViewportBackendOptions } from './types.js';
|
|
2
|
-
export declare class XtermTerminalBackend implements TerminalViewportBackend {
|
|
3
|
-
readonly kind: "xterm";
|
|
4
|
-
private rows;
|
|
5
|
-
private cols;
|
|
6
|
-
private terminal;
|
|
7
|
-
constructor(options: TerminalViewportBackendOptions);
|
|
8
|
-
resize(rows: number, cols: number): void;
|
|
9
|
-
write(data: string): void;
|
|
10
|
-
getText(): string;
|
|
11
|
-
getCursorPosition(): {
|
|
12
|
-
col: number;
|
|
13
|
-
row: number;
|
|
14
|
-
};
|
|
15
|
-
dispose(): void;
|
|
16
|
-
private createTerminal;
|
|
17
|
-
}
|
package/dist/mesh/mesh-sync.d.ts
DELETED
|
@@ -1,53 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Mesh Sync — Sync local mesh metadata to/from cloud D1
|
|
3
|
-
*
|
|
4
|
-
* When cloud is available, this module pushes local mesh config
|
|
5
|
-
* to the server and pulls remote meshes that were created from
|
|
6
|
-
* other machines. The local ~/.adhdev/meshes.json remains the
|
|
7
|
-
* canonical source; cloud is a membership/metadata layer only.
|
|
8
|
-
* Task/chat/ledger evidence remains local-first and must not be
|
|
9
|
-
* synchronized through Cloud/D1.
|
|
10
|
-
*
|
|
11
|
-
* This is called lazily (not on daemon startup) — only when the
|
|
12
|
-
* user explicitly opens the mesh page or runs `adhdev mesh sync`.
|
|
13
|
-
*/
|
|
14
|
-
export interface MeshSyncTransport {
|
|
15
|
-
/** GET /api/v1/repo-meshes */
|
|
16
|
-
listRemoteMeshes(): Promise<{
|
|
17
|
-
meshes: RemoteMeshRecord[];
|
|
18
|
-
}>;
|
|
19
|
-
/** POST /api/v1/repo-meshes */
|
|
20
|
-
createRemoteMesh(data: {
|
|
21
|
-
name: string;
|
|
22
|
-
repo_identity: string;
|
|
23
|
-
repo_remote_url?: string;
|
|
24
|
-
default_branch?: string;
|
|
25
|
-
policy?: string;
|
|
26
|
-
}): Promise<{
|
|
27
|
-
mesh: RemoteMeshRecord;
|
|
28
|
-
}>;
|
|
29
|
-
/** DELETE /api/v1/repo-meshes/:id */
|
|
30
|
-
deleteRemoteMesh(meshId: string): Promise<void>;
|
|
31
|
-
}
|
|
32
|
-
export interface RemoteMeshRecord {
|
|
33
|
-
id: string;
|
|
34
|
-
name: string;
|
|
35
|
-
repo_identity: string;
|
|
36
|
-
repo_remote_url: string | null;
|
|
37
|
-
default_branch: string | null;
|
|
38
|
-
policy: string;
|
|
39
|
-
status: string;
|
|
40
|
-
created_at: string;
|
|
41
|
-
updated_at: string;
|
|
42
|
-
}
|
|
43
|
-
export interface MeshSyncResult {
|
|
44
|
-
pushed: number;
|
|
45
|
-
pulled: number;
|
|
46
|
-
deleted: number;
|
|
47
|
-
errors: string[];
|
|
48
|
-
}
|
|
49
|
-
/**
|
|
50
|
-
* Push local meshes to cloud (upsert by repo_identity).
|
|
51
|
-
* Pull remote meshes that don't exist locally.
|
|
52
|
-
*/
|
|
53
|
-
export declare function syncMeshes(transport: MeshSyncTransport): Promise<MeshSyncResult>;
|
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
import type { TerminalViewportBackend, TerminalViewportBackendOptions, TerminalViewportBackendPreference } from './types.js';
|
|
2
|
-
export declare function resolveTerminalBackendPreference(): TerminalViewportBackendPreference;
|
|
3
|
-
export declare function isGhosttyVtBackendAvailable(): boolean;
|
|
4
|
-
export declare class GhosttyVtTerminalBackend implements TerminalViewportBackend {
|
|
5
|
-
readonly kind: "ghostty-vt";
|
|
6
|
-
private terminal;
|
|
7
|
-
constructor(options: TerminalViewportBackendOptions);
|
|
8
|
-
resize(rows: number, cols: number): void;
|
|
9
|
-
write(data: string): void;
|
|
10
|
-
getText(): string;
|
|
11
|
-
getCursorPosition(): {
|
|
12
|
-
col: number;
|
|
13
|
-
row: number;
|
|
14
|
-
};
|
|
15
|
-
dispose(): void;
|
|
16
|
-
}
|