pi-crew 0.2.3 → 0.2.4
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/AGENTS.md +57 -32
- package/CHANGELOG.md +466 -448
- package/LICENSE +21 -21
- package/NOTICE.md +16 -16
- package/README.md +323 -323
- package/docs/FEATURE_INTAKE.md +126 -0
- package/docs/HARNESS.md +86 -0
- package/docs/HARNESS_BACKLOG.md +41 -0
- package/docs/TEST_MATRIX.md +49 -0
- package/docs/actions-reference.md +595 -595
- package/docs/architecture.md +180 -180
- package/docs/code-review-2026-05-11.md +592 -592
- package/docs/commands-reference.md +347 -347
- package/docs/comparison-pi-subagents-vs-pi-crew.md +303 -0
- package/docs/decisions/0001-durable-state.md +41 -0
- package/docs/decisions/0002-child-process-for-async.md +42 -0
- package/docs/decisions/0003-depth-guard.md +36 -0
- package/docs/decisions/0004-execfile-over-exec.md +34 -0
- package/docs/decisions/0005-no-parameter-properties.md +49 -0
- package/docs/decisions/0006-publish-bundled-esm.md +63 -0
- package/docs/decisions/0007-active-run-binary-index.md +54 -0
- package/docs/decisions/0008-child-pi-warm-pool.md +61 -0
- package/docs/decisions/README.md +23 -0
- package/docs/followup-review-round4-2026-05-13.md +107 -0
- package/docs/implementation-plan-top3.md +333 -0
- package/docs/live-mailbox-runtime.md +36 -36
- package/docs/next-upgrade-roadmap.md +808 -808
- package/docs/oh-my-pi-research.md +509 -0
- package/docs/perf/baseline-2026-05.md +113 -0
- package/docs/perf/final-report-2026-05.md +206 -0
- package/docs/perf/sprint-1-report.md +71 -0
- package/docs/perf/sprint-2-report.md +81 -0
- package/docs/perf/sprint-2.5-report.md +53 -0
- package/docs/perf/sprint-3-report.md +36 -0
- package/docs/perf/sprint-4-report.md +47 -0
- package/docs/perf/sprint-5-report.md +51 -0
- package/docs/perf/sprint-6-report.md +94 -0
- package/docs/perf/sprint-7-report.md +74 -0
- package/docs/perf/upgrade-plan-2026-05.md +147 -0
- package/docs/pi-subagents3-deep-analysis.md +508 -0
- package/docs/product/README.md +31 -0
- package/docs/product/platform.md +27 -0
- package/docs/product/runtime-safety.md +37 -0
- package/docs/product/team-run.md +39 -0
- package/docs/product/team-tool.md +37 -0
- package/docs/publishing.md +65 -65
- package/docs/resource-formats.md +134 -134
- package/docs/runtime-analysis-child-vs-live.md +171 -0
- package/docs/runtime-flow.md +148 -148
- package/docs/runtime-migration-in-process-analysis.md +250 -0
- package/docs/stories/README.md +30 -0
- package/docs/stories/backlog.md +36 -0
- package/docs/templates/decision.md +27 -0
- package/docs/templates/story.md +44 -0
- package/docs/templates/validation-report.md +32 -0
- package/docs/usage.md +238 -238
- package/index.ts +7 -6
- package/install.mjs +65 -65
- package/package.json +107 -100
- package/schema.json +222 -222
- package/skills/child-pi-spawning/SKILL.md +213 -0
- package/skills/context-artifact-hygiene/SKILL.md +32 -0
- package/skills/event-log-tracing/SKILL.md +299 -0
- package/skills/git-master/SKILL.md +225 -24
- package/skills/live-agent-lifecycle/SKILL.md +192 -0
- package/skills/mailbox-interactive/SKILL.md +300 -19
- package/skills/model-routing-context/SKILL.md +94 -0
- package/skills/multi-perspective-review/SKILL.md +88 -0
- package/skills/read-only-explorer/SKILL.md +250 -26
- package/skills/safe-bash/SKILL.md +307 -21
- package/skills/verification-before-done/SKILL.md +11 -2
- package/skills/widget-rendering/SKILL.md +258 -0
- package/skills/workspace-isolation/SKILL.md +202 -0
- package/skills/worktree-isolation/SKILL.md +202 -18
- package/src/adapters/claude-adapter.ts +25 -25
- package/src/adapters/codex-adapter.ts +21 -21
- package/src/adapters/cursor-adapter.ts +17 -17
- package/src/adapters/export-util.ts +137 -137
- package/src/adapters/index.ts +15 -15
- package/src/adapters/registry.ts +18 -18
- package/src/adapters/types.ts +23 -23
- package/src/agents/agent-config.ts +38 -38
- package/src/agents/agent-serializer.ts +38 -38
- package/src/agents/discover-agents.ts +121 -118
- package/src/config/config.ts +740 -858
- package/src/config/defaults.ts +96 -96
- package/src/config/drift-detector.ts +211 -211
- package/src/config/markers.ts +327 -327
- package/src/config/resilient-parser.ts +109 -108
- package/src/config/suggestions.ts +74 -74
- package/src/config/types.ts +199 -0
- package/src/extension/async-notifier.ts +123 -89
- package/src/extension/autonomous-policy.ts +169 -169
- package/src/extension/cross-extension-rpc.ts +104 -104
- package/src/extension/help.ts +47 -47
- package/src/extension/import-index.ts +69 -69
- package/src/extension/management.ts +395 -382
- package/src/extension/notification-router.ts +116 -116
- package/src/extension/notification-sink.ts +51 -51
- package/src/extension/project-init.ts +168 -168
- package/src/extension/register.ts +859 -668
- package/src/extension/registration/artifact-cleanup.ts +15 -15
- package/src/extension/registration/command-utils.ts +54 -54
- package/src/extension/registration/commands.ts +559 -452
- package/src/extension/registration/compaction-guard.ts +125 -125
- package/src/extension/registration/subagent-helpers.ts +102 -102
- package/src/extension/registration/subagent-tools.ts +220 -159
- package/src/extension/registration/team-tool.ts +159 -99
- package/src/extension/registration/viewers.ts +29 -0
- package/src/extension/result-watcher.ts +128 -128
- package/src/extension/run-bundle-schema.ts +89 -89
- package/src/extension/run-export.ts +73 -73
- package/src/extension/run-import.ts +84 -84
- package/src/extension/run-index.ts +94 -94
- package/src/extension/run-maintenance.ts +142 -142
- package/src/extension/session-summary.ts +8 -8
- package/src/extension/team-manager-command.ts +96 -96
- package/src/extension/team-recommendation.ts +188 -188
- package/src/extension/team-tool/api.ts +5 -2
- package/src/extension/team-tool/cancel.ts +224 -209
- package/src/extension/team-tool/config-patch.ts +36 -36
- package/src/extension/team-tool/context.ts +60 -60
- package/src/extension/team-tool/doctor.ts +242 -242
- package/src/extension/team-tool/handle-settings.ts +421 -195
- package/src/extension/team-tool/inspect.ts +41 -41
- package/src/extension/team-tool/lifecycle-actions.ts +139 -139
- package/src/extension/team-tool/parallel-dispatch.ts +156 -156
- package/src/extension/team-tool/plan.ts +19 -19
- package/src/extension/team-tool/respond.ts +112 -111
- package/src/extension/team-tool/run.ts +246 -229
- package/src/extension/team-tool/status.ts +110 -110
- package/src/extension/team-tool-types.ts +13 -13
- package/src/extension/team-tool.ts +344 -344
- package/src/extension/tool-result.ts +16 -16
- package/src/extension/validate-resources.ts +77 -77
- package/src/hooks/registry.ts +61 -61
- package/src/hooks/types.ts +40 -40
- package/src/i18n.ts +184 -184
- package/src/observability/correlation.ts +35 -35
- package/src/observability/event-to-metric.ts +68 -68
- package/src/observability/exporters/adapter.ts +30 -30
- package/src/observability/exporters/otlp-exporter.ts +106 -92
- package/src/observability/exporters/prometheus-exporter.ts +54 -54
- package/src/observability/metric-registry.ts +87 -87
- package/src/observability/metric-retention.ts +54 -54
- package/src/observability/metric-sink.ts +81 -56
- package/src/observability/metrics-primitives.ts +167 -167
- package/src/prompt/prompt-runtime.ts +72 -72
- package/src/runtime/adaptive-plan.ts +338 -0
- package/src/runtime/agent-control.ts +169 -169
- package/src/runtime/agent-memory.ts +72 -72
- package/src/runtime/agent-observability.ts +114 -114
- package/src/runtime/async-marker.ts +26 -26
- package/src/runtime/async-runner.ts +153 -153
- package/src/runtime/attention-events.ts +28 -28
- package/src/runtime/auto-resume.ts +100 -100
- package/src/runtime/background-runner.ts +122 -89
- package/src/runtime/cancellation.ts +61 -61
- package/src/runtime/capability-inventory.ts +116 -116
- package/src/runtime/child-pi-pool.ts +68 -0
- package/src/runtime/child-pi.ts +541 -461
- package/src/runtime/code-summary.ts +247 -247
- package/src/runtime/compaction-summary.ts +271 -271
- package/src/runtime/concurrency.ts +58 -58
- package/src/runtime/crash-recovery.ts +317 -301
- package/src/runtime/crew-agent-records.ts +379 -281
- package/src/runtime/crew-agent-runtime.ts +60 -60
- package/src/runtime/cross-extension-rpc.ts +72 -0
- package/src/runtime/custom-tools/irc-tool.ts +201 -201
- package/src/runtime/custom-tools/submit-result-tool.ts +90 -90
- package/src/runtime/deadletter.ts +47 -47
- package/src/runtime/delivery-coordinator.ts +176 -176
- package/src/runtime/delta-conflict.ts +360 -360
- package/src/runtime/diagnostic-export.ts +102 -102
- package/src/runtime/direct-run.ts +35 -35
- package/src/runtime/effectiveness.ts +82 -81
- package/src/runtime/errors/crew-errors.ts +166 -0
- package/src/runtime/event-stream-bridge.ts +92 -92
- package/src/runtime/foreground-control.ts +82 -82
- package/src/runtime/green-contract.ts +46 -46
- package/src/runtime/group-join.ts +234 -106
- package/src/runtime/heartbeat-watcher.ts +145 -124
- package/src/runtime/iteration-hooks.ts +267 -267
- package/src/runtime/live-agent-control.ts +88 -88
- package/src/runtime/live-agent-manager.ts +377 -179
- package/src/runtime/live-control-realtime.ts +36 -36
- package/src/runtime/live-session-runtime.ts +676 -600
- package/src/runtime/loop-gates.ts +129 -129
- package/src/runtime/manifest-cache.ts +263 -263
- package/src/runtime/mcp-proxy.ts +113 -113
- package/src/runtime/metric-parser.ts +40 -40
- package/src/runtime/model-fallback.ts +282 -274
- package/src/runtime/model-resolver.ts +118 -0
- package/src/runtime/output-validator.ts +187 -187
- package/src/runtime/overflow-recovery.ts +175 -175
- package/src/runtime/parallel-research.ts +44 -44
- package/src/runtime/parallel-utils.ts +156 -156
- package/src/runtime/parent-guard.ts +80 -80
- package/src/runtime/phase-progress.ts +217 -217
- package/src/runtime/pi-args.ts +165 -165
- package/src/runtime/pi-json-output.ts +111 -111
- package/src/runtime/pi-spawn.ts +167 -167
- package/src/runtime/policy-engine.ts +79 -79
- package/src/runtime/post-checks.ts +125 -125
- package/src/runtime/post-exit-stdio-guard.ts +86 -86
- package/src/runtime/process-status.ts +97 -73
- package/src/runtime/progress-event-coalescer.ts +43 -43
- package/src/runtime/recovery-recipes.ts +74 -74
- package/src/runtime/retry-executor.ts +81 -81
- package/src/runtime/role-permission.ts +39 -39
- package/src/runtime/run-tracker.ts +99 -0
- package/src/runtime/runtime-policy.ts +21 -0
- package/src/runtime/runtime-resolver.ts +94 -91
- package/src/runtime/scheduler.ts +294 -0
- package/src/runtime/semaphore.ts +131 -131
- package/src/runtime/sensitive-paths.ts +92 -92
- package/src/runtime/session-usage.ts +79 -79
- package/src/runtime/settings-store.ts +103 -0
- package/src/runtime/sidechain-output.ts +29 -29
- package/src/runtime/skill-instructions.ts +222 -222
- package/src/runtime/stale-reconciler.ts +198 -189
- package/src/runtime/streaming-output.ts +47 -0
- package/src/runtime/subagent-manager.ts +404 -400
- package/src/runtime/subprocess-tool-registry.ts +67 -67
- package/src/runtime/task-display.ts +38 -38
- package/src/runtime/task-graph-scheduler.ts +122 -122
- package/src/runtime/task-graph.ts +207 -207
- package/src/runtime/task-output-context.ts +177 -177
- package/src/runtime/task-packet.ts +93 -93
- package/src/runtime/task-quality.ts +207 -207
- package/src/runtime/task-runner/capabilities.ts +78 -78
- package/src/runtime/task-runner/live-executor.ts +131 -113
- package/src/runtime/task-runner/progress.ts +119 -119
- package/src/runtime/task-runner/prompt-builder.ts +139 -139
- package/src/runtime/task-runner/prompt-pipeline.ts +64 -64
- package/src/runtime/task-runner/result-utils.ts +14 -14
- package/src/runtime/task-runner/run-projection.ts +103 -103
- package/src/runtime/task-runner/state-helpers.ts +22 -22
- package/src/runtime/task-runner.ts +469 -459
- package/src/runtime/team-runner.ts +693 -945
- package/src/runtime/usage-tracker.ts +71 -0
- package/src/runtime/worker-heartbeat.ts +21 -21
- package/src/runtime/worker-startup.ts +57 -57
- package/src/runtime/workflow-state.ts +187 -187
- package/src/runtime/yield-handler.ts +190 -190
- package/src/schema/config-schema.ts +172 -168
- package/src/schema/team-tool-schema.ts +126 -126
- package/src/schema/validation-types.ts +151 -148
- package/src/skills/discover-skills.ts +67 -67
- package/src/skills/skill-templates.ts +374 -374
- package/src/state/active-run-registry.ts +227 -191
- package/src/state/artifact-store.ts +130 -129
- package/src/state/atomic-write.ts +262 -195
- package/src/state/blob-store.ts +116 -116
- package/src/state/contracts.ts +111 -111
- package/src/state/event-log-rotation.ts +161 -158
- package/src/state/event-log.ts +383 -303
- package/src/state/event-reconstructor.ts +217 -217
- package/src/state/jsonl-writer.ts +82 -82
- package/src/state/locks.ts +146 -146
- package/src/state/mailbox.ts +446 -405
- package/src/state/state-store.ts +364 -351
- package/src/state/task-claims.ts +44 -44
- package/src/state/types.ts +285 -285
- package/src/state/usage.ts +29 -29
- package/src/subagents/async-entry.ts +1 -1
- package/src/subagents/index.ts +3 -3
- package/src/subagents/live/control.ts +1 -1
- package/src/subagents/live/manager.ts +1 -1
- package/src/subagents/live/realtime.ts +1 -1
- package/src/subagents/live/session-runtime.ts +1 -1
- package/src/subagents/manager.ts +1 -1
- package/src/subagents/spawn.ts +1 -1
- package/src/teams/discover-teams.ts +116 -116
- package/src/teams/team-config.ts +27 -27
- package/src/teams/team-serializer.ts +38 -38
- package/src/types/diff.d.ts +18 -18
- package/src/ui/agent-management-overlay.ts +144 -144
- package/src/ui/crew-widget.ts +487 -370
- package/src/ui/dashboard-panes/agents-pane.ts +109 -28
- package/src/ui/dashboard-panes/cancellation-pane.ts +42 -42
- package/src/ui/dashboard-panes/capability-pane.ts +59 -59
- package/src/ui/dashboard-panes/health-pane.ts +30 -30
- package/src/ui/dashboard-panes/mailbox-pane.ts +35 -35
- package/src/ui/dashboard-panes/progress-pane.ts +30 -30
- package/src/ui/dashboard-panes/transcript-pane.ts +10 -10
- package/src/ui/heartbeat-aggregator.ts +63 -63
- package/src/ui/keybinding-map.ts +97 -94
- package/src/ui/live-conversation-overlay.ts +152 -0
- package/src/ui/live-run-sidebar.ts +180 -180
- package/src/ui/mascot.ts +442 -442
- package/src/ui/overlays/agent-picker-overlay.ts +57 -57
- package/src/ui/overlays/confirm-overlay.ts +58 -58
- package/src/ui/overlays/mailbox-compose-overlay.ts +144 -144
- package/src/ui/overlays/mailbox-compose-preview.ts +63 -63
- package/src/ui/overlays/mailbox-detail-overlay.ts +122 -122
- package/src/ui/pi-ui-compat.ts +57 -57
- package/src/ui/powerbar-publisher.ts +221 -197
- package/src/ui/render-scheduler.ts +216 -143
- package/src/ui/run-action-dispatcher.ts +118 -118
- package/src/ui/run-dashboard.ts +526 -464
- package/src/ui/run-event-bus.ts +208 -208
- package/src/ui/run-snapshot-cache.ts +826 -777
- package/src/ui/settings-overlay.ts +721 -0
- package/src/ui/snapshot-types.ts +86 -70
- package/src/ui/theme-adapter.ts +190 -190
- package/src/ui/tool-progress-formatter.ts +89 -0
- package/src/ui/transcript-cache.ts +94 -94
- package/src/ui/transcript-viewer.ts +335 -335
- package/src/utils/conflict-detect.ts +662 -0
- package/src/utils/file-coalescer.ts +86 -86
- package/src/utils/frontmatter.ts +68 -68
- package/src/utils/fs-watch.ts +88 -31
- package/src/utils/gh-protocol.ts +479 -0
- package/src/utils/ids.ts +17 -17
- package/src/utils/incremental-reader.ts +104 -104
- package/src/utils/internal-error.ts +6 -6
- package/src/utils/names.ts +27 -27
- package/src/utils/paths.ts +102 -63
- package/src/utils/redaction.ts +44 -44
- package/src/utils/safe-paths.ts +47 -47
- package/src/utils/scan-cache.ts +136 -136
- package/src/utils/sse-parser.ts +134 -134
- package/src/utils/task-name-generator.ts +337 -337
- package/src/utils/timings.ts +33 -33
- package/src/utils/visual.ts +243 -198
- package/src/workflows/discover-workflows.ts +139 -139
- package/src/workflows/validate-workflow.ts +40 -40
- package/src/workflows/workflow-config.ts +26 -26
- package/src/workflows/workflow-serializer.ts +32 -32
- package/src/worktree/branch-freshness.ts +45 -45
- package/src/worktree/cleanup.ts +75 -75
- package/src/worktree/worktree-manager.ts +188 -188
- package/teams/default.team.md +12 -12
- package/teams/fast-fix.team.md +11 -11
- package/teams/implementation.team.md +18 -18
- package/teams/parallel-research.team.md +14 -14
- package/teams/research.team.md +11 -11
- package/teams/review.team.md +12 -12
- package/tsconfig.json +19 -19
- package/workflows/default.workflow.md +30 -30
- package/workflows/fast-fix.workflow.md +23 -23
- package/workflows/implementation.workflow.md +43 -43
- package/workflows/parallel-research.workflow.md +46 -46
- package/workflows/research.workflow.md +22 -22
- package/workflows/review.workflow.md +30 -30
- package/skills/task-packet/SKILL.md +0 -28
- package/skills/verify-evidence/SKILL.md +0 -27
package/src/runtime/semaphore.ts
CHANGED
|
@@ -1,131 +1,131 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Phase 6: Semaphore and fail-fast parallel execution.
|
|
3
|
-
*
|
|
4
|
-
* Adapted from oh-my-pi's `parallel.ts` Semaphore class and
|
|
5
|
-
* `mapWithConcurrencyLimit` implementation. Provides:
|
|
6
|
-
* - Explicit acquire/release Semaphore for concurrency control
|
|
7
|
-
* - Fail-fast on first error (via Promise.race)
|
|
8
|
-
* - AbortSignal support for graceful cancellation
|
|
9
|
-
* - Partial results on abort
|
|
10
|
-
*/
|
|
11
|
-
|
|
12
|
-
/**
|
|
13
|
-
* Simple counting semaphore for limiting concurrency across independently-scheduled async work.
|
|
14
|
-
*/
|
|
15
|
-
export class Semaphore {
|
|
16
|
-
#max: number;
|
|
17
|
-
#current = 0;
|
|
18
|
-
#queue: Array<() => void> = [];
|
|
19
|
-
|
|
20
|
-
constructor(max: number) {
|
|
21
|
-
this.#max = Math.max(1, max);
|
|
22
|
-
}
|
|
23
|
-
|
|
24
|
-
async acquire(): Promise<void> {
|
|
25
|
-
if (this.#current < this.#max) {
|
|
26
|
-
this.#current++;
|
|
27
|
-
return;
|
|
28
|
-
}
|
|
29
|
-
const { promise, resolve } = (() => {
|
|
30
|
-
let res: () => void;
|
|
31
|
-
const p = new Promise<void>((r) => { res = r; });
|
|
32
|
-
return { promise: p, resolve: res! };
|
|
33
|
-
})();
|
|
34
|
-
this.#queue.push(resolve);
|
|
35
|
-
return promise;
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
release(): void {
|
|
39
|
-
const next = this.#queue.shift();
|
|
40
|
-
if (next) {
|
|
41
|
-
next();
|
|
42
|
-
} else if (this.#current > 0) {
|
|
43
|
-
this.#current--;
|
|
44
|
-
}
|
|
45
|
-
// Guard: over-release is a no-op to prevent #current going negative
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
/** Current number of acquired slots. */
|
|
49
|
-
get current(): number {
|
|
50
|
-
return this.#current;
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
/** Number of waiters in the queue. */
|
|
54
|
-
get waiting(): number {
|
|
55
|
-
return this.#queue.length;
|
|
56
|
-
}
|
|
57
|
-
}
|
|
58
|
-
|
|
59
|
-
/**
|
|
60
|
-
* Result of parallel execution with fail-fast support.
|
|
61
|
-
*/
|
|
62
|
-
export interface ParallelResult<R> {
|
|
63
|
-
/** Results array — undefined entries indicate tasks that were skipped due to abort. */
|
|
64
|
-
results: (R | undefined)[];
|
|
65
|
-
/** Whether execution was aborted before all tasks completed. */
|
|
66
|
-
aborted: boolean;
|
|
67
|
-
/** The first error that triggered fail-fast, if any. */
|
|
68
|
-
firstError?: unknown;
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
/**
|
|
72
|
-
* Execute items with a concurrency limit, fail-fast, and abort signal support.
|
|
73
|
-
*
|
|
74
|
-
* - On first error: aborts remaining workers and rethrows.
|
|
75
|
-
* - On external abort: returns partial results with `aborted: true`.
|
|
76
|
-
* - Results are returned in the same order as input items.
|
|
77
|
-
*
|
|
78
|
-
* Adapted from oh-my-pi's `mapWithConcurrencyLimit`.
|
|
79
|
-
*/
|
|
80
|
-
export async function mapWithFailFast<T, R>(
|
|
81
|
-
items: T[],
|
|
82
|
-
concurrency: number,
|
|
83
|
-
fn: (item: T, index: number, signal: AbortSignal) => Promise<R>,
|
|
84
|
-
signal?: AbortSignal,
|
|
85
|
-
): Promise<ParallelResult<R>> {
|
|
86
|
-
const limit = Math.max(1, Math.min(concurrency, items.length));
|
|
87
|
-
const results: (R | undefined)[] = new Array(items.length);
|
|
88
|
-
let nextIndex = 0;
|
|
89
|
-
|
|
90
|
-
// Internal abort controller for fail-fast
|
|
91
|
-
const abortController = new AbortController();
|
|
92
|
-
const workerSignal = signal
|
|
93
|
-
? AbortSignal.any([signal, abortController.signal])
|
|
94
|
-
: abortController.signal;
|
|
95
|
-
|
|
96
|
-
// Promise that rejects on first error — used for fail-fast
|
|
97
|
-
let rejectFirst: (error: unknown) => void;
|
|
98
|
-
const firstErrorPromise = new Promise<never>((_, reject) => {
|
|
99
|
-
rejectFirst = reject;
|
|
100
|
-
});
|
|
101
|
-
|
|
102
|
-
const worker = async (): Promise<void> => {
|
|
103
|
-
while (true) {
|
|
104
|
-
if (workerSignal.aborted) return;
|
|
105
|
-
const index = nextIndex++;
|
|
106
|
-
if (index >= items.length) return;
|
|
107
|
-
try {
|
|
108
|
-
results[index] = await fn(items[index], index, workerSignal);
|
|
109
|
-
} catch (error) {
|
|
110
|
-
if (!workerSignal.aborted) {
|
|
111
|
-
abortController.abort();
|
|
112
|
-
rejectFirst(error);
|
|
113
|
-
throw error;
|
|
114
|
-
}
|
|
115
|
-
}
|
|
116
|
-
}
|
|
117
|
-
};
|
|
118
|
-
|
|
119
|
-
const workers = Array.from({ length: limit }, () => worker());
|
|
120
|
-
|
|
121
|
-
try {
|
|
122
|
-
await Promise.race([Promise.all(workers), firstErrorPromise]);
|
|
123
|
-
} catch (error) {
|
|
124
|
-
if (signal?.aborted) {
|
|
125
|
-
return { results, aborted: true, firstError: error };
|
|
126
|
-
}
|
|
127
|
-
throw error;
|
|
128
|
-
}
|
|
129
|
-
|
|
130
|
-
return { results, aborted: signal?.aborted ?? false };
|
|
131
|
-
}
|
|
1
|
+
/**
|
|
2
|
+
* Phase 6: Semaphore and fail-fast parallel execution.
|
|
3
|
+
*
|
|
4
|
+
* Adapted from oh-my-pi's `parallel.ts` Semaphore class and
|
|
5
|
+
* `mapWithConcurrencyLimit` implementation. Provides:
|
|
6
|
+
* - Explicit acquire/release Semaphore for concurrency control
|
|
7
|
+
* - Fail-fast on first error (via Promise.race)
|
|
8
|
+
* - AbortSignal support for graceful cancellation
|
|
9
|
+
* - Partial results on abort
|
|
10
|
+
*/
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* Simple counting semaphore for limiting concurrency across independently-scheduled async work.
|
|
14
|
+
*/
|
|
15
|
+
export class Semaphore {
|
|
16
|
+
#max: number;
|
|
17
|
+
#current = 0;
|
|
18
|
+
#queue: Array<() => void> = [];
|
|
19
|
+
|
|
20
|
+
constructor(max: number) {
|
|
21
|
+
this.#max = Math.max(1, max);
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
async acquire(): Promise<void> {
|
|
25
|
+
if (this.#current < this.#max) {
|
|
26
|
+
this.#current++;
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
const { promise, resolve } = (() => {
|
|
30
|
+
let res: () => void;
|
|
31
|
+
const p = new Promise<void>((r) => { res = r; });
|
|
32
|
+
return { promise: p, resolve: res! };
|
|
33
|
+
})();
|
|
34
|
+
this.#queue.push(resolve);
|
|
35
|
+
return promise;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
release(): void {
|
|
39
|
+
const next = this.#queue.shift();
|
|
40
|
+
if (next) {
|
|
41
|
+
next();
|
|
42
|
+
} else if (this.#current > 0) {
|
|
43
|
+
this.#current--;
|
|
44
|
+
}
|
|
45
|
+
// Guard: over-release is a no-op to prevent #current going negative
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
/** Current number of acquired slots. */
|
|
49
|
+
get current(): number {
|
|
50
|
+
return this.#current;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
/** Number of waiters in the queue. */
|
|
54
|
+
get waiting(): number {
|
|
55
|
+
return this.#queue.length;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
/**
|
|
60
|
+
* Result of parallel execution with fail-fast support.
|
|
61
|
+
*/
|
|
62
|
+
export interface ParallelResult<R> {
|
|
63
|
+
/** Results array — undefined entries indicate tasks that were skipped due to abort. */
|
|
64
|
+
results: (R | undefined)[];
|
|
65
|
+
/** Whether execution was aborted before all tasks completed. */
|
|
66
|
+
aborted: boolean;
|
|
67
|
+
/** The first error that triggered fail-fast, if any. */
|
|
68
|
+
firstError?: unknown;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
/**
|
|
72
|
+
* Execute items with a concurrency limit, fail-fast, and abort signal support.
|
|
73
|
+
*
|
|
74
|
+
* - On first error: aborts remaining workers and rethrows.
|
|
75
|
+
* - On external abort: returns partial results with `aborted: true`.
|
|
76
|
+
* - Results are returned in the same order as input items.
|
|
77
|
+
*
|
|
78
|
+
* Adapted from oh-my-pi's `mapWithConcurrencyLimit`.
|
|
79
|
+
*/
|
|
80
|
+
export async function mapWithFailFast<T, R>(
|
|
81
|
+
items: T[],
|
|
82
|
+
concurrency: number,
|
|
83
|
+
fn: (item: T, index: number, signal: AbortSignal) => Promise<R>,
|
|
84
|
+
signal?: AbortSignal,
|
|
85
|
+
): Promise<ParallelResult<R>> {
|
|
86
|
+
const limit = Math.max(1, Math.min(concurrency, items.length));
|
|
87
|
+
const results: (R | undefined)[] = new Array(items.length);
|
|
88
|
+
let nextIndex = 0;
|
|
89
|
+
|
|
90
|
+
// Internal abort controller for fail-fast
|
|
91
|
+
const abortController = new AbortController();
|
|
92
|
+
const workerSignal = signal
|
|
93
|
+
? AbortSignal.any([signal, abortController.signal])
|
|
94
|
+
: abortController.signal;
|
|
95
|
+
|
|
96
|
+
// Promise that rejects on first error — used for fail-fast
|
|
97
|
+
let rejectFirst: (error: unknown) => void;
|
|
98
|
+
const firstErrorPromise = new Promise<never>((_, reject) => {
|
|
99
|
+
rejectFirst = reject;
|
|
100
|
+
});
|
|
101
|
+
|
|
102
|
+
const worker = async (): Promise<void> => {
|
|
103
|
+
while (true) {
|
|
104
|
+
if (workerSignal.aborted) return;
|
|
105
|
+
const index = nextIndex++;
|
|
106
|
+
if (index >= items.length) return;
|
|
107
|
+
try {
|
|
108
|
+
results[index] = await fn(items[index], index, workerSignal);
|
|
109
|
+
} catch (error) {
|
|
110
|
+
if (!workerSignal.aborted) {
|
|
111
|
+
abortController.abort();
|
|
112
|
+
rejectFirst(error);
|
|
113
|
+
throw error;
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
};
|
|
118
|
+
|
|
119
|
+
const workers = Array.from({ length: limit }, () => worker());
|
|
120
|
+
|
|
121
|
+
try {
|
|
122
|
+
await Promise.race([Promise.all(workers), firstErrorPromise]);
|
|
123
|
+
} catch (error) {
|
|
124
|
+
if (signal?.aborted) {
|
|
125
|
+
return { results, aborted: true, firstError: error };
|
|
126
|
+
}
|
|
127
|
+
throw error;
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
return { results, aborted: signal?.aborted ?? false };
|
|
131
|
+
}
|
|
@@ -1,92 +1,92 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Sensitive file detection for worker constraints.
|
|
3
|
-
*
|
|
4
|
-
* Inspired by caveman's compress.py — prevents workers from reading
|
|
5
|
-
* or compressing files that contain secrets, credentials, or PII.
|
|
6
|
-
*
|
|
7
|
-
* Workers should refuse operations on matching paths. This is enforced
|
|
8
|
-
* in the worker prompt and validated here for defense-in-depth.
|
|
9
|
-
*/
|
|
10
|
-
|
|
11
|
-
import * as path from "node:path";
|
|
12
|
-
|
|
13
|
-
/** Basenames that almost certainly hold secrets or PII */
|
|
14
|
-
const SENSITIVE_BASENAMES = /\.(?:env|pem|key|p12|pfx|crt|cer|jks|keystore|asc|gpg)(?:\..+)?$/i;
|
|
15
|
-
const SENSITIVE_EXACT = /^(?:\.env|\.netrc|\.npmrc|\.pypirc|credentials|secrets?|passwords?|id_(?:rsa|dsa|ecdsa|ed25519)(?:\.pub)?|authorized_keys|known_hosts|jwt\.json|session\.cookie|\.token)$/i;
|
|
16
|
-
|
|
17
|
-
/** Path components that indicate sensitive directories */
|
|
18
|
-
const SENSITIVE_DIRS = new Set([".ssh", ".aws", ".gnupg", ".kube", ".docker", ".config/gcloud", ".config/gh"]);
|
|
19
|
-
|
|
20
|
-
/** Name tokens that suggest sensitive content */
|
|
21
|
-
const SENSITIVE_TOKENS = ["secret", "credential", "password", "passwd", "apikey", "accesskey", "token", "privatekey"];
|
|
22
|
-
|
|
23
|
-
/**
|
|
24
|
-
* Check if a file path looks like it contains sensitive data.
|
|
25
|
-
* Returns true if the path should be refused for worker operations.
|
|
26
|
-
*/
|
|
27
|
-
export function isSensitivePath(filePath: string): boolean {
|
|
28
|
-
const resolved = path.resolve(filePath);
|
|
29
|
-
const basename = path.basename(resolved);
|
|
30
|
-
const lower = basename.toLowerCase();
|
|
31
|
-
|
|
32
|
-
// Check exact sensitive filenames
|
|
33
|
-
if (SENSITIVE_EXACT.test(basename)) return true;
|
|
34
|
-
|
|
35
|
-
// Check sensitive extensions
|
|
36
|
-
if (SENSITIVE_BASENAMES.test(basename)) return true;
|
|
37
|
-
|
|
38
|
-
// Check path components
|
|
39
|
-
const parts = resolved.split(/[/\\]/).map((p) => p.toLowerCase());
|
|
40
|
-
for (const dir of SENSITIVE_DIRS) {
|
|
41
|
-
const dirParts = dir.split("/");
|
|
42
|
-
for (let i = 0; i <= parts.length - dirParts.length; i++) {
|
|
43
|
-
const slice = parts.slice(i, i + dirParts.length);
|
|
44
|
-
if (slice.join("/") === dir) return true;
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
// Check name tokens with word-boundary awareness to reduce false positives.
|
|
49
|
-
// Strategy: split filename on separators to get "words", then check if
|
|
50
|
-
// any token matches. For substring matching in the normalized form,
|
|
51
|
-
// we require the token to end at a segment boundary or string end.
|
|
52
|
-
// This matches 'secret', 'secrets' but NOT 'secretary'.
|
|
53
|
-
const words = lower.split(/[_\-\s.\W]+/).filter(Boolean);
|
|
54
|
-
const normalized = lower.replace(/[_\-\s.]/g, "");
|
|
55
|
-
for (const token of SENSITIVE_TOKENS) {
|
|
56
|
-
// Check individual words — exact match or token is prefix and word is <= token+2 chars
|
|
57
|
-
for (const word of words) {
|
|
58
|
-
if (word === token) return true;
|
|
59
|
-
// 'secrets' starts with 'secret' and is only 1 char longer → match
|
|
60
|
-
// 'secretary' starts with 'secret' but is 4 chars longer → no match
|
|
61
|
-
if (word.startsWith(token) && word.length <= token.length + 2) return true;
|
|
62
|
-
}
|
|
63
|
-
// Check fully-normalized form for compound tokens like 'api-key' → 'apikey'
|
|
64
|
-
// The token must appear as a complete segment (not a partial substring).
|
|
65
|
-
// After the token, the remaining chars must be a complete word (extension).
|
|
66
|
-
const idx = normalized.indexOf(token);
|
|
67
|
-
if (idx !== -1) {
|
|
68
|
-
const after = idx + token.length;
|
|
69
|
-
if (after === normalized.length) return true;
|
|
70
|
-
// Check if remaining chars after token correspond to a known word segment
|
|
71
|
-
const remaining = normalized.slice(after);
|
|
72
|
-
if (words.some((w) => remaining === w || remaining.startsWith(w))) return true;
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
|
|
76
|
-
return false;
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
/**
|
|
80
|
-
* Build a worker prompt constraint block listing forbidden paths.
|
|
81
|
-
* This goes into the worker system prompt to prevent accidental reads.
|
|
82
|
-
*/
|
|
83
|
-
export function buildSensitivePathConstraint(): string {
|
|
84
|
-
return [
|
|
85
|
-
"## Security Constraints",
|
|
86
|
-
"NEVER read, compress, or include content from:",
|
|
87
|
-
"- Files matching: .env*, *.pem, *.key, *.p12, credentials*, secrets*, passwords*, id_rsa*",
|
|
88
|
-
"- Directories: .ssh/, .aws/, .gnupg/, .kube/, .docker/",
|
|
89
|
-
"- Files with names containing: secret, credential, password, apikey, token, privatekey",
|
|
90
|
-
"If asked to read such a file, refuse and explain the security risk.",
|
|
91
|
-
].join("\n");
|
|
92
|
-
}
|
|
1
|
+
/**
|
|
2
|
+
* Sensitive file detection for worker constraints.
|
|
3
|
+
*
|
|
4
|
+
* Inspired by caveman's compress.py — prevents workers from reading
|
|
5
|
+
* or compressing files that contain secrets, credentials, or PII.
|
|
6
|
+
*
|
|
7
|
+
* Workers should refuse operations on matching paths. This is enforced
|
|
8
|
+
* in the worker prompt and validated here for defense-in-depth.
|
|
9
|
+
*/
|
|
10
|
+
|
|
11
|
+
import * as path from "node:path";
|
|
12
|
+
|
|
13
|
+
/** Basenames that almost certainly hold secrets or PII */
|
|
14
|
+
const SENSITIVE_BASENAMES = /\.(?:env|pem|key|p12|pfx|crt|cer|jks|keystore|asc|gpg)(?:\..+)?$/i;
|
|
15
|
+
const SENSITIVE_EXACT = /^(?:\.env|\.netrc|\.npmrc|\.pypirc|credentials|secrets?|passwords?|id_(?:rsa|dsa|ecdsa|ed25519)(?:\.pub)?|authorized_keys|known_hosts|jwt\.json|session\.cookie|\.token)$/i;
|
|
16
|
+
|
|
17
|
+
/** Path components that indicate sensitive directories */
|
|
18
|
+
const SENSITIVE_DIRS = new Set([".ssh", ".aws", ".gnupg", ".kube", ".docker", ".config/gcloud", ".config/gh"]);
|
|
19
|
+
|
|
20
|
+
/** Name tokens that suggest sensitive content */
|
|
21
|
+
const SENSITIVE_TOKENS = ["secret", "credential", "password", "passwd", "apikey", "accesskey", "token", "privatekey"];
|
|
22
|
+
|
|
23
|
+
/**
|
|
24
|
+
* Check if a file path looks like it contains sensitive data.
|
|
25
|
+
* Returns true if the path should be refused for worker operations.
|
|
26
|
+
*/
|
|
27
|
+
export function isSensitivePath(filePath: string): boolean {
|
|
28
|
+
const resolved = path.resolve(filePath);
|
|
29
|
+
const basename = path.basename(resolved);
|
|
30
|
+
const lower = basename.toLowerCase();
|
|
31
|
+
|
|
32
|
+
// Check exact sensitive filenames
|
|
33
|
+
if (SENSITIVE_EXACT.test(basename)) return true;
|
|
34
|
+
|
|
35
|
+
// Check sensitive extensions
|
|
36
|
+
if (SENSITIVE_BASENAMES.test(basename)) return true;
|
|
37
|
+
|
|
38
|
+
// Check path components
|
|
39
|
+
const parts = resolved.split(/[/\\]/).map((p) => p.toLowerCase());
|
|
40
|
+
for (const dir of SENSITIVE_DIRS) {
|
|
41
|
+
const dirParts = dir.split("/");
|
|
42
|
+
for (let i = 0; i <= parts.length - dirParts.length; i++) {
|
|
43
|
+
const slice = parts.slice(i, i + dirParts.length);
|
|
44
|
+
if (slice.join("/") === dir) return true;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
// Check name tokens with word-boundary awareness to reduce false positives.
|
|
49
|
+
// Strategy: split filename on separators to get "words", then check if
|
|
50
|
+
// any token matches. For substring matching in the normalized form,
|
|
51
|
+
// we require the token to end at a segment boundary or string end.
|
|
52
|
+
// This matches 'secret', 'secrets' but NOT 'secretary'.
|
|
53
|
+
const words = lower.split(/[_\-\s.\W]+/).filter(Boolean);
|
|
54
|
+
const normalized = lower.replace(/[_\-\s.]/g, "");
|
|
55
|
+
for (const token of SENSITIVE_TOKENS) {
|
|
56
|
+
// Check individual words — exact match or token is prefix and word is <= token+2 chars
|
|
57
|
+
for (const word of words) {
|
|
58
|
+
if (word === token) return true;
|
|
59
|
+
// 'secrets' starts with 'secret' and is only 1 char longer → match
|
|
60
|
+
// 'secretary' starts with 'secret' but is 4 chars longer → no match
|
|
61
|
+
if (word.startsWith(token) && word.length <= token.length + 2) return true;
|
|
62
|
+
}
|
|
63
|
+
// Check fully-normalized form for compound tokens like 'api-key' → 'apikey'
|
|
64
|
+
// The token must appear as a complete segment (not a partial substring).
|
|
65
|
+
// After the token, the remaining chars must be a complete word (extension).
|
|
66
|
+
const idx = normalized.indexOf(token);
|
|
67
|
+
if (idx !== -1) {
|
|
68
|
+
const after = idx + token.length;
|
|
69
|
+
if (after === normalized.length) return true;
|
|
70
|
+
// Check if remaining chars after token correspond to a known word segment
|
|
71
|
+
const remaining = normalized.slice(after);
|
|
72
|
+
if (words.some((w) => remaining === w || remaining.startsWith(w))) return true;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
return false;
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
/**
|
|
80
|
+
* Build a worker prompt constraint block listing forbidden paths.
|
|
81
|
+
* This goes into the worker system prompt to prevent accidental reads.
|
|
82
|
+
*/
|
|
83
|
+
export function buildSensitivePathConstraint(): string {
|
|
84
|
+
return [
|
|
85
|
+
"## Security Constraints",
|
|
86
|
+
"NEVER read, compress, or include content from:",
|
|
87
|
+
"- Files matching: .env*, *.pem, *.key, *.p12, credentials*, secrets*, passwords*, id_rsa*",
|
|
88
|
+
"- Directories: .ssh/, .aws/, .gnupg/, .kube/, .docker/",
|
|
89
|
+
"- Files with names containing: secret, credential, password, apikey, token, privatekey",
|
|
90
|
+
"If asked to read such a file, refuse and explain the security risk.",
|
|
91
|
+
].join("\n");
|
|
92
|
+
}
|
|
@@ -1,79 +1,79 @@
|
|
|
1
|
-
import * as fs from "node:fs";
|
|
2
|
-
import type { UsageState } from "../state/types.ts";
|
|
3
|
-
|
|
4
|
-
function asRecord(value: unknown): Record<string, unknown> | undefined {
|
|
5
|
-
return value && typeof value === "object" && !Array.isArray(value) ? value as Record<string, unknown> : undefined;
|
|
6
|
-
}
|
|
7
|
-
|
|
8
|
-
function numberField(obj: Record<string, unknown>, keys: string[]): number | undefined {
|
|
9
|
-
for (const key of keys) {
|
|
10
|
-
const value = obj[key];
|
|
11
|
-
if (typeof value === "number" && Number.isFinite(value)) return value;
|
|
12
|
-
}
|
|
13
|
-
return undefined;
|
|
14
|
-
}
|
|
15
|
-
|
|
16
|
-
function usageFromValue(value: unknown): UsageState | undefined {
|
|
17
|
-
const obj = asRecord(value);
|
|
18
|
-
if (!obj) return undefined;
|
|
19
|
-
const direct: UsageState = {
|
|
20
|
-
input: numberField(obj, ["input", "inputTokens", "input_tokens"]),
|
|
21
|
-
output: numberField(obj, ["output", "outputTokens", "output_tokens"]),
|
|
22
|
-
cacheRead: numberField(obj, ["cacheRead", "cache_read", "cacheReadTokens", "cache_read_tokens"]),
|
|
23
|
-
cacheWrite: numberField(obj, ["cacheWrite", "cache_write", "cacheWriteTokens", "cache_write_tokens"]),
|
|
24
|
-
cost: numberField(obj, ["cost", "costUsd", "cost_usd"]),
|
|
25
|
-
turns: numberField(obj, ["turns", "turnCount", "turn_count"]),
|
|
26
|
-
};
|
|
27
|
-
if (Object.values(direct).some((entry) => entry !== undefined)) return direct;
|
|
28
|
-
for (const key of ["usage", "tokenUsage", "tokens", "stats"]) {
|
|
29
|
-
const nested = usageFromValue(obj[key]);
|
|
30
|
-
if (nested) return nested;
|
|
31
|
-
}
|
|
32
|
-
const message = asRecord(obj.message);
|
|
33
|
-
return message ? usageFromValue(message.usage) : undefined;
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
function addUsage(total: UsageState, usage: UsageState): UsageState {
|
|
37
|
-
return {
|
|
38
|
-
input: (total.input ?? 0) + (usage.input ?? 0),
|
|
39
|
-
output: (total.output ?? 0) + (usage.output ?? 0),
|
|
40
|
-
cacheRead: (total.cacheRead ?? 0) + (usage.cacheRead ?? 0),
|
|
41
|
-
cacheWrite: (total.cacheWrite ?? 0) + (usage.cacheWrite ?? 0),
|
|
42
|
-
cost: (total.cost ?? 0) + (usage.cost ?? 0),
|
|
43
|
-
turns: (total.turns ?? 0) + (usage.turns ?? 0),
|
|
44
|
-
};
|
|
45
|
-
}
|
|
46
|
-
|
|
47
|
-
function compactUsage(total: UsageState, foundKeys: Set<keyof UsageState>): UsageState | undefined {
|
|
48
|
-
if (foundKeys.size === 0) return undefined;
|
|
49
|
-
const compact: UsageState = {};
|
|
50
|
-
for (const key of foundKeys) compact[key] = total[key];
|
|
51
|
-
return compact;
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
export function parseSessionUsageFromJsonlText(text: string): UsageState | undefined {
|
|
55
|
-
let total: UsageState = {};
|
|
56
|
-
const foundKeys = new Set<keyof UsageState>();
|
|
57
|
-
for (const line of text.split(/\r?\n/)) {
|
|
58
|
-
const trimmed = line.trim();
|
|
59
|
-
if (!trimmed) continue;
|
|
60
|
-
try {
|
|
61
|
-
const usage = usageFromValue(JSON.parse(trimmed) as unknown);
|
|
62
|
-
if (!usage) continue;
|
|
63
|
-
for (const key of Object.keys(usage) as Array<keyof UsageState>) foundKeys.add(key);
|
|
64
|
-
total = addUsage(total, usage);
|
|
65
|
-
} catch {
|
|
66
|
-
// Session JSONL can contain partial/corrupt lines after interrupted workers.
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
|
-
return compactUsage(total, foundKeys);
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
export function parseSessionUsage(filePath: string): UsageState | undefined {
|
|
73
|
-
try {
|
|
74
|
-
if (!fs.existsSync(filePath)) return undefined;
|
|
75
|
-
return parseSessionUsageFromJsonlText(fs.readFileSync(filePath, "utf-8"));
|
|
76
|
-
} catch {
|
|
77
|
-
return undefined;
|
|
78
|
-
}
|
|
79
|
-
}
|
|
1
|
+
import * as fs from "node:fs";
|
|
2
|
+
import type { UsageState } from "../state/types.ts";
|
|
3
|
+
|
|
4
|
+
function asRecord(value: unknown): Record<string, unknown> | undefined {
|
|
5
|
+
return value && typeof value === "object" && !Array.isArray(value) ? value as Record<string, unknown> : undefined;
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
function numberField(obj: Record<string, unknown>, keys: string[]): number | undefined {
|
|
9
|
+
for (const key of keys) {
|
|
10
|
+
const value = obj[key];
|
|
11
|
+
if (typeof value === "number" && Number.isFinite(value)) return value;
|
|
12
|
+
}
|
|
13
|
+
return undefined;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
function usageFromValue(value: unknown): UsageState | undefined {
|
|
17
|
+
const obj = asRecord(value);
|
|
18
|
+
if (!obj) return undefined;
|
|
19
|
+
const direct: UsageState = {
|
|
20
|
+
input: numberField(obj, ["input", "inputTokens", "input_tokens"]),
|
|
21
|
+
output: numberField(obj, ["output", "outputTokens", "output_tokens"]),
|
|
22
|
+
cacheRead: numberField(obj, ["cacheRead", "cache_read", "cacheReadTokens", "cache_read_tokens"]),
|
|
23
|
+
cacheWrite: numberField(obj, ["cacheWrite", "cache_write", "cacheWriteTokens", "cache_write_tokens"]),
|
|
24
|
+
cost: numberField(obj, ["cost", "costUsd", "cost_usd"]),
|
|
25
|
+
turns: numberField(obj, ["turns", "turnCount", "turn_count"]),
|
|
26
|
+
};
|
|
27
|
+
if (Object.values(direct).some((entry) => entry !== undefined)) return direct;
|
|
28
|
+
for (const key of ["usage", "tokenUsage", "tokens", "stats"]) {
|
|
29
|
+
const nested = usageFromValue(obj[key]);
|
|
30
|
+
if (nested) return nested;
|
|
31
|
+
}
|
|
32
|
+
const message = asRecord(obj.message);
|
|
33
|
+
return message ? usageFromValue(message.usage) : undefined;
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
function addUsage(total: UsageState, usage: UsageState): UsageState {
|
|
37
|
+
return {
|
|
38
|
+
input: (total.input ?? 0) + (usage.input ?? 0),
|
|
39
|
+
output: (total.output ?? 0) + (usage.output ?? 0),
|
|
40
|
+
cacheRead: (total.cacheRead ?? 0) + (usage.cacheRead ?? 0),
|
|
41
|
+
cacheWrite: (total.cacheWrite ?? 0) + (usage.cacheWrite ?? 0),
|
|
42
|
+
cost: (total.cost ?? 0) + (usage.cost ?? 0),
|
|
43
|
+
turns: (total.turns ?? 0) + (usage.turns ?? 0),
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
function compactUsage(total: UsageState, foundKeys: Set<keyof UsageState>): UsageState | undefined {
|
|
48
|
+
if (foundKeys.size === 0) return undefined;
|
|
49
|
+
const compact: UsageState = {};
|
|
50
|
+
for (const key of foundKeys) compact[key] = total[key];
|
|
51
|
+
return compact;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
export function parseSessionUsageFromJsonlText(text: string): UsageState | undefined {
|
|
55
|
+
let total: UsageState = {};
|
|
56
|
+
const foundKeys = new Set<keyof UsageState>();
|
|
57
|
+
for (const line of text.split(/\r?\n/)) {
|
|
58
|
+
const trimmed = line.trim();
|
|
59
|
+
if (!trimmed) continue;
|
|
60
|
+
try {
|
|
61
|
+
const usage = usageFromValue(JSON.parse(trimmed) as unknown);
|
|
62
|
+
if (!usage) continue;
|
|
63
|
+
for (const key of Object.keys(usage) as Array<keyof UsageState>) foundKeys.add(key);
|
|
64
|
+
total = addUsage(total, usage);
|
|
65
|
+
} catch {
|
|
66
|
+
// Session JSONL can contain partial/corrupt lines after interrupted workers.
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
return compactUsage(total, foundKeys);
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
export function parseSessionUsage(filePath: string): UsageState | undefined {
|
|
73
|
+
try {
|
|
74
|
+
if (!fs.existsSync(filePath)) return undefined;
|
|
75
|
+
return parseSessionUsageFromJsonlText(fs.readFileSync(filePath, "utf-8"));
|
|
76
|
+
} catch {
|
|
77
|
+
return undefined;
|
|
78
|
+
}
|
|
79
|
+
}
|