@getpaseo/server 0.1.74 → 0.1.76
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/scripts/supervisor-entrypoint.js +2 -21
- package/dist/scripts/supervisor-entrypoint.js.map +1 -1
- package/dist/scripts/supervisor-log-config.js +31 -0
- package/dist/scripts/supervisor-log-config.js.map +1 -0
- package/dist/server/client/daemon-client.d.ts +13 -2
- package/dist/server/client/daemon-client.d.ts.map +1 -1
- package/dist/server/client/daemon-client.js +36 -0
- package/dist/server/client/daemon-client.js.map +1 -1
- package/dist/server/server/agent/agent-manager.d.ts +5 -1
- package/dist/server/server/agent/agent-manager.d.ts.map +1 -1
- package/dist/server/server/agent/agent-manager.js +152 -22
- package/dist/server/server/agent/agent-manager.js.map +1 -1
- package/dist/server/server/agent/agent-prompt.d.ts.map +1 -1
- package/dist/server/server/agent/agent-prompt.js +27 -0
- package/dist/server/server/agent/agent-prompt.js.map +1 -1
- package/dist/server/server/agent/agent-sdk-types.d.ts +5 -0
- package/dist/server/server/agent/agent-sdk-types.d.ts.map +1 -1
- package/dist/server/server/agent/agent-sdk-types.js +10 -0
- package/dist/server/server/agent/agent-sdk-types.js.map +1 -1
- package/dist/server/server/agent/foreground-run-state.d.ts +1 -1
- package/dist/server/server/agent/foreground-run-state.d.ts.map +1 -1
- package/dist/server/server/agent/foreground-run-state.js +2 -4
- package/dist/server/server/agent/foreground-run-state.js.map +1 -1
- package/dist/server/server/agent/mcp-server.d.ts.map +1 -1
- package/dist/server/server/agent/mcp-server.js +74 -3
- package/dist/server/server/agent/mcp-server.js.map +1 -1
- package/dist/server/server/agent/provider-history-timestamps.d.ts +2 -0
- package/dist/server/server/agent/provider-history-timestamps.d.ts.map +1 -0
- package/dist/server/server/agent/provider-history-timestamps.js +16 -0
- package/dist/server/server/agent/provider-history-timestamps.js.map +1 -0
- package/dist/server/server/agent/provider-manifest.d.ts +1 -1
- package/dist/server/server/agent/provider-manifest.d.ts.map +1 -1
- package/dist/server/server/agent/provider-manifest.js +17 -3
- package/dist/server/server/agent/provider-manifest.js.map +1 -1
- package/dist/server/server/agent/provider-registry.d.ts.map +1 -1
- package/dist/server/server/agent/provider-registry.js +66 -32
- package/dist/server/server/agent/provider-registry.js.map +1 -1
- package/dist/server/server/agent/provider-snapshot-manager.d.ts +2 -6
- package/dist/server/server/agent/provider-snapshot-manager.d.ts.map +1 -1
- package/dist/server/server/agent/provider-snapshot-manager.js +43 -32
- package/dist/server/server/agent/provider-snapshot-manager.js.map +1 -1
- package/dist/server/server/agent/providers/acp-agent.d.ts +42 -2
- package/dist/server/server/agent/providers/acp-agent.d.ts.map +1 -1
- package/dist/server/server/agent/providers/acp-agent.js +182 -28
- package/dist/server/server/agent/providers/acp-agent.js.map +1 -1
- package/dist/server/server/agent/providers/claude/agent.d.ts +1 -1
- package/dist/server/server/agent/providers/claude/agent.d.ts.map +1 -1
- package/dist/server/server/agent/providers/claude/agent.js +191 -62
- package/dist/server/server/agent/providers/claude/agent.js.map +1 -1
- package/dist/server/server/agent/providers/claude/models.d.ts +2 -0
- package/dist/server/server/agent/providers/claude/models.d.ts.map +1 -1
- package/dist/server/server/agent/providers/claude/models.js +78 -0
- package/dist/server/server/agent/providers/claude/models.js.map +1 -1
- package/dist/server/server/agent/providers/codex/app-server-transport.d.ts +8 -1
- package/dist/server/server/agent/providers/codex/app-server-transport.d.ts.map +1 -1
- package/dist/server/server/agent/providers/codex/app-server-transport.js +32 -1
- package/dist/server/server/agent/providers/codex/app-server-transport.js.map +1 -1
- package/dist/server/server/agent/providers/codex/tool-call-mapper.d.ts.map +1 -1
- package/dist/server/server/agent/providers/codex/tool-call-mapper.js +36 -7
- package/dist/server/server/agent/providers/codex/tool-call-mapper.js.map +1 -1
- package/dist/server/server/agent/providers/codex-app-server-agent.d.ts +28 -4
- package/dist/server/server/agent/providers/codex-app-server-agent.d.ts.map +1 -1
- package/dist/server/server/agent/providers/codex-app-server-agent.js +487 -80
- package/dist/server/server/agent/providers/codex-app-server-agent.js.map +1 -1
- package/dist/server/server/agent/providers/copilot-acp-agent.d.ts +10 -1
- package/dist/server/server/agent/providers/copilot-acp-agent.d.ts.map +1 -1
- package/dist/server/server/agent/providers/copilot-acp-agent.js +114 -7
- package/dist/server/server/agent/providers/copilot-acp-agent.js.map +1 -1
- package/dist/server/server/agent/providers/cursor-acp-agent.d.ts +21 -0
- package/dist/server/server/agent/providers/cursor-acp-agent.d.ts.map +1 -0
- package/dist/server/server/agent/providers/cursor-acp-agent.js +85 -0
- package/dist/server/server/agent/providers/cursor-acp-agent.js.map +1 -0
- package/dist/server/server/agent/providers/generic-acp-agent.d.ts +13 -0
- package/dist/server/server/agent/providers/generic-acp-agent.d.ts.map +1 -1
- package/dist/server/server/agent/providers/generic-acp-agent.js +209 -2
- package/dist/server/server/agent/providers/generic-acp-agent.js.map +1 -1
- package/dist/server/server/agent/providers/opencode-agent.d.ts +7 -7
- package/dist/server/server/agent/providers/opencode-agent.d.ts.map +1 -1
- package/dist/server/server/agent/providers/opencode-agent.js +121 -109
- package/dist/server/server/agent/providers/opencode-agent.js.map +1 -1
- package/dist/server/server/agent/providers/pi-direct-agent.d.ts +2 -2
- package/dist/server/server/agent/providers/pi-direct-agent.d.ts.map +1 -1
- package/dist/server/server/agent/providers/pi-direct-agent.js +16 -15
- package/dist/server/server/agent/providers/pi-direct-agent.js.map +1 -1
- package/dist/server/server/agent/providers/pi-session-recovery-policy.d.ts +22 -0
- package/dist/server/server/agent/providers/pi-session-recovery-policy.d.ts.map +1 -0
- package/dist/server/server/agent/providers/pi-session-recovery-policy.js +51 -0
- package/dist/server/server/agent/providers/pi-session-recovery-policy.js.map +1 -0
- package/dist/server/server/agent/providers/provider-runner.d.ts +1 -1
- package/dist/server/server/agent/providers/provider-runner.d.ts.map +1 -1
- package/dist/server/server/agent/providers/provider-runner.js +2 -1
- package/dist/server/server/agent/providers/provider-runner.js.map +1 -1
- package/dist/server/server/agent/providers/test-utils/session-stream-adapter.d.ts +1 -1
- package/dist/server/server/agent/providers/test-utils/session-stream-adapter.d.ts.map +1 -1
- package/dist/server/server/agent/providers/test-utils/session-stream-adapter.js +2 -1
- package/dist/server/server/agent/providers/test-utils/session-stream-adapter.js.map +1 -1
- package/dist/server/server/agent/providers/tool-call-detail-primitives.d.ts.map +1 -1
- package/dist/server/server/agent/stt-manager.d.ts +5 -1
- package/dist/server/server/agent/stt-manager.d.ts.map +1 -1
- package/dist/server/server/agent/stt-manager.js +3 -2
- package/dist/server/server/agent/stt-manager.js.map +1 -1
- package/dist/server/server/agent/timeline-projection.d.ts.map +1 -1
- package/dist/server/server/agent/timeline-projection.js +9 -0
- package/dist/server/server/agent/timeline-projection.js.map +1 -1
- package/dist/server/server/auto-archive-on-merge/archive-if-safe.d.ts +40 -0
- package/dist/server/server/auto-archive-on-merge/archive-if-safe.d.ts.map +1 -0
- package/dist/server/server/auto-archive-on-merge/archive-if-safe.js +80 -0
- package/dist/server/server/auto-archive-on-merge/archive-if-safe.js.map +1 -0
- package/dist/server/server/auto-archive-on-merge/index.d.ts +8 -0
- package/dist/server/server/auto-archive-on-merge/index.d.ts.map +1 -0
- package/dist/server/server/auto-archive-on-merge/index.js +15 -0
- package/dist/server/server/auto-archive-on-merge/index.js.map +1 -0
- package/dist/server/server/bootstrap.d.ts +6 -0
- package/dist/server/server/bootstrap.d.ts.map +1 -1
- package/dist/server/server/bootstrap.js +74 -38
- package/dist/server/server/bootstrap.js.map +1 -1
- package/dist/server/server/checkout/status-projection.d.ts.map +1 -1
- package/dist/server/server/checkout/status-projection.js +5 -1
- package/dist/server/server/checkout/status-projection.js.map +1 -1
- package/dist/server/server/config.d.ts.map +1 -1
- package/dist/server/server/config.js +3 -1
- package/dist/server/server/config.js.map +1 -1
- package/dist/server/server/daemon-config-store.js +1 -0
- package/dist/server/server/daemon-config-store.js.map +1 -1
- package/dist/server/server/dictation/dictation-stream-manager.d.ts +2 -0
- package/dist/server/server/dictation/dictation-stream-manager.d.ts.map +1 -1
- package/dist/server/server/dictation/dictation-stream-manager.js +2 -1
- package/dist/server/server/dictation/dictation-stream-manager.js.map +1 -1
- package/dist/server/server/logger.js +1 -1
- package/dist/server/server/logger.js.map +1 -1
- package/dist/server/server/loop/rpc-schemas.d.ts +96 -96
- package/dist/server/server/loop-service.d.ts +18 -18
- package/dist/server/server/paseo-worktree-service.d.ts +3 -1
- package/dist/server/server/paseo-worktree-service.d.ts.map +1 -1
- package/dist/server/server/paseo-worktree-service.js +55 -18
- package/dist/server/server/paseo-worktree-service.js.map +1 -1
- package/dist/server/server/persisted-config.d.ts +25 -0
- package/dist/server/server/persisted-config.d.ts.map +1 -1
- package/dist/server/server/persisted-config.js +3 -0
- package/dist/server/server/persisted-config.js.map +1 -1
- package/dist/server/server/relay-transport.d.ts +2 -1
- package/dist/server/server/relay-transport.d.ts.map +1 -1
- package/dist/server/server/relay-transport.js +26 -4
- package/dist/server/server/relay-transport.js.map +1 -1
- package/dist/server/server/schedule/service.d.ts.map +1 -1
- package/dist/server/server/schedule/service.js +14 -1
- package/dist/server/server/schedule/service.js.map +1 -1
- package/dist/server/server/session.d.ts +9 -0
- package/dist/server/server/session.d.ts.map +1 -1
- package/dist/server/server/session.js +281 -50
- package/dist/server/server/session.js.map +1 -1
- package/dist/server/server/speech/providers/local/config.d.ts +5 -0
- package/dist/server/server/speech/providers/local/config.d.ts.map +1 -1
- package/dist/server/server/speech/providers/local/config.js +35 -0
- package/dist/server/server/speech/providers/local/config.js.map +1 -1
- package/dist/server/server/speech/speech-config-resolver.d.ts.map +1 -1
- package/dist/server/server/speech/speech-config-resolver.js +1 -0
- package/dist/server/server/speech/speech-config-resolver.js.map +1 -1
- package/dist/server/server/speech/speech-runtime.d.ts +2 -0
- package/dist/server/server/speech/speech-runtime.d.ts.map +1 -1
- package/dist/server/server/speech/speech-runtime.js +2 -0
- package/dist/server/server/speech/speech-runtime.js.map +1 -1
- package/dist/server/server/voice/voice-turn-controller.d.ts +1 -0
- package/dist/server/server/voice/voice-turn-controller.d.ts.map +1 -1
- package/dist/server/server/voice/voice-turn-controller.js +1 -1
- package/dist/server/server/voice/voice-turn-controller.js.map +1 -1
- package/dist/server/server/websocket-server.d.ts.map +1 -1
- package/dist/server/server/websocket-server.js +7 -0
- package/dist/server/server/websocket-server.js.map +1 -1
- package/dist/server/server/workspace-git-service.d.ts +6 -1
- package/dist/server/server/workspace-git-service.d.ts.map +1 -1
- package/dist/server/server/workspace-git-service.js +27 -4
- package/dist/server/server/workspace-git-service.js.map +1 -1
- package/dist/server/server/workspace-reconciliation-service.d.ts +4 -2
- package/dist/server/server/workspace-reconciliation-service.d.ts.map +1 -1
- package/dist/server/server/workspace-reconciliation-service.js +112 -14
- package/dist/server/server/workspace-reconciliation-service.js.map +1 -1
- package/dist/server/server/workspace-registry.d.ts +6 -1
- package/dist/server/server/workspace-registry.d.ts.map +1 -1
- package/dist/server/server/workspace-registry.js +11 -0
- package/dist/server/server/workspace-registry.js.map +1 -1
- package/dist/server/server/worktree-session.d.ts.map +1 -1
- package/dist/server/server/worktree-session.js +1 -0
- package/dist/server/server/worktree-session.js.map +1 -1
- package/dist/server/services/github-service.d.ts +46 -0
- package/dist/server/services/github-service.d.ts.map +1 -1
- package/dist/server/services/github-service.js +274 -5
- package/dist/server/services/github-service.js.map +1 -1
- package/dist/server/shared/messages.d.ts +3427 -290
- package/dist/server/shared/messages.d.ts.map +1 -1
- package/dist/server/shared/messages.js +93 -3
- package/dist/server/shared/messages.js.map +1 -1
- package/dist/server/shared/terminal-input-mode.d.ts +26 -0
- package/dist/server/shared/terminal-input-mode.d.ts.map +1 -0
- package/dist/server/shared/terminal-input-mode.js +151 -0
- package/dist/server/shared/terminal-input-mode.js.map +1 -0
- package/dist/server/terminal/terminal-session-controller.d.ts.map +1 -1
- package/dist/server/terminal/terminal-session-controller.js +12 -2
- package/dist/server/terminal/terminal-session-controller.js.map +1 -1
- package/dist/server/terminal/terminal.d.ts +1 -0
- package/dist/server/terminal/terminal.d.ts.map +1 -1
- package/dist/server/terminal/terminal.js +16 -3
- package/dist/server/terminal/terminal.js.map +1 -1
- package/dist/server/terminal/worker-terminal-manager.d.ts.map +1 -1
- package/dist/server/terminal/worker-terminal-manager.js +8 -0
- package/dist/server/terminal/worker-terminal-manager.js.map +1 -1
- package/dist/server/utils/checkout-git.d.ts +4 -1
- package/dist/server/utils/checkout-git.d.ts.map +1 -1
- package/dist/server/utils/checkout-git.js +85 -29
- package/dist/server/utils/checkout-git.js.map +1 -1
- package/dist/server/utils/directory-suggestions.d.ts.map +1 -1
- package/dist/server/utils/directory-suggestions.js +51 -14
- package/dist/server/utils/directory-suggestions.js.map +1 -1
- package/dist/server/utils/executable.d.ts.map +1 -1
- package/dist/server/utils/executable.js +6 -3
- package/dist/server/utils/executable.js.map +1 -1
- package/dist/server/utils/run-git-command.d.ts +2 -0
- package/dist/server/utils/run-git-command.d.ts.map +1 -1
- package/dist/server/utils/run-git-command.js +41 -1
- package/dist/server/utils/run-git-command.js.map +1 -1
- package/dist/server/utils/worktree.js +1 -1
- package/dist/server/utils/worktree.js.map +1 -1
- package/dist/src/server/agent/agent-sdk-types.js +10 -0
- package/dist/src/server/agent/agent-sdk-types.js.map +1 -1
- package/dist/src/server/agent/provider-manifest.js +17 -3
- package/dist/src/server/agent/provider-manifest.js.map +1 -1
- package/dist/src/server/persisted-config.js +3 -0
- package/dist/src/server/persisted-config.js.map +1 -1
- package/dist/src/shared/messages.js +93 -3
- package/dist/src/shared/messages.js.map +1 -1
- package/dist/src/utils/executable.js +6 -3
- package/dist/src/utils/executable.js.map +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-reconciliation-service.d.ts","sourceRoot":"","sources":["../../../src/server/workspace-reconciliation-service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EACV,eAAe,EACf,iBAAiB,EACjB,sBAAsB,EACtB,wBAAwB,EACzB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"workspace-reconciliation-service.d.ts","sourceRoot":"","sources":["../../../src/server/workspace-reconciliation-service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EACV,eAAe,EACf,iBAAiB,EACjB,sBAAsB,EACtB,wBAAwB,EACzB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AA6BtE,MAAM,MAAM,oBAAoB,GAC5B;IAAE,IAAI,EAAE,oBAAoB,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACtF;IAAE,IAAI,EAAE,kBAAkB,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAClF;IACE,IAAI,EAAE,iBAAiB,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,OAAO,CACb,IAAI,CAAC,sBAAsB,EAAE,MAAM,GAAG,aAAa,GAAG,UAAU,GAAG,YAAY,CAAC,CACjF,CAAC;CACH,GACD;IACE,IAAI,EAAE,mBAAmB,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,wBAAwB,EAAE,WAAW,GAAG,aAAa,GAAG,MAAM,CAAC,CAAC,CAAC;CACvF,CAAC;AAEN,MAAM,WAAW,oBAAoB;IACnC,cAAc,EAAE,oBAAoB,EAAE,CAAC;IACvC,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,qCAAqC;IACpD,eAAe,EAAE,eAAe,CAAC;IACjC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,oBAAoB,EAAE,KAAK,IAAI,CAAC;IACtD,mBAAmB,CAAC,EAAE,IAAI,CAAC,mBAAmB,EAAE,yBAAyB,CAAC,CAAC;CAC5E;AAED,qBAAa,8BAA8B;IACzC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAClD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IACtD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAqD;IAC/E,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA8D;IAClG,OAAO,CAAC,KAAK,CAA+C;IAC5D,OAAO,CAAC,OAAO,CAAS;gBAEZ,OAAO,EAAE,qCAAqC;IAS1D,KAAK,IAAI,IAAI;IAQb,IAAI,IAAI,IAAI;IAON,OAAO,IAAI,OAAO,CAAC,oBAAoB,CAAC;YAIhC,OAAO;YAkBP,SAAS;YAiFT,4BAA4B;YAyD5B,+BAA+B;YA4B/B,gBAAgB;YAiFhB,wBAAwB;CAgBvC"}
|
|
@@ -1,5 +1,27 @@
|
|
|
1
1
|
import { existsSync } from "node:fs";
|
|
2
|
+
import { normalizeWorkspaceId } from "./workspace-registry-model.js";
|
|
2
3
|
const DEFAULT_RECONCILE_INTERVAL_MS = 60000;
|
|
4
|
+
function deriveWorkspaceKindFromMetadata(metadata) {
|
|
5
|
+
if (metadata.projectKind !== "git")
|
|
6
|
+
return "directory";
|
|
7
|
+
if (metadata.isWorktree)
|
|
8
|
+
return "worktree";
|
|
9
|
+
return "local_checkout";
|
|
10
|
+
}
|
|
11
|
+
function chooseCanonicalProject(projects) {
|
|
12
|
+
return [...projects].sort((left, right) => {
|
|
13
|
+
const leftRemote = left.projectId.startsWith("remote:");
|
|
14
|
+
const rightRemote = right.projectId.startsWith("remote:");
|
|
15
|
+
if (leftRemote !== rightRemote) {
|
|
16
|
+
return leftRemote ? -1 : 1;
|
|
17
|
+
}
|
|
18
|
+
const createdAt = Date.parse(left.createdAt) - Date.parse(right.createdAt);
|
|
19
|
+
if (createdAt !== 0) {
|
|
20
|
+
return createdAt;
|
|
21
|
+
}
|
|
22
|
+
return left.projectId.localeCompare(right.projectId);
|
|
23
|
+
})[0];
|
|
24
|
+
}
|
|
3
25
|
export class WorkspaceReconciliationService {
|
|
4
26
|
constructor(options) {
|
|
5
27
|
this.timer = null;
|
|
@@ -76,7 +98,9 @@ export class WorkspaceReconciliationService {
|
|
|
76
98
|
workspacesByProject.set(workspace.projectId, updated);
|
|
77
99
|
}
|
|
78
100
|
}));
|
|
79
|
-
// 2.
|
|
101
|
+
// 2. Merge duplicate active project records that point at the same repo root.
|
|
102
|
+
await this.mergeDuplicateProjectsByRoot(activeProjects, workspacesByProject, changes);
|
|
103
|
+
// 3. Archive orphaned projects (all workspaces archived/removed)
|
|
80
104
|
const orphanedProjects = activeProjects.filter((project) => {
|
|
81
105
|
const siblings = workspacesByProject.get(project.projectId) ?? [];
|
|
82
106
|
return siblings.length === 0;
|
|
@@ -91,7 +115,7 @@ export class WorkspaceReconciliationService {
|
|
|
91
115
|
reason: "no_active_workspaces",
|
|
92
116
|
});
|
|
93
117
|
}));
|
|
94
|
-
//
|
|
118
|
+
// 4. Reconcile git metadata for active projects whose directories still exist
|
|
95
119
|
const projectsToReconcile = activeProjects.filter((project) => {
|
|
96
120
|
if (project.archivedAt)
|
|
97
121
|
return false;
|
|
@@ -108,6 +132,71 @@ export class WorkspaceReconciliationService {
|
|
|
108
132
|
}
|
|
109
133
|
return { changesApplied: changes, durationMs: Date.now() - start };
|
|
110
134
|
}
|
|
135
|
+
async mergeDuplicateProjectsByRoot(activeProjects, workspacesByProject, changes) {
|
|
136
|
+
const projectsByRoot = new Map();
|
|
137
|
+
for (const project of activeProjects) {
|
|
138
|
+
if (project.kind !== "git") {
|
|
139
|
+
continue;
|
|
140
|
+
}
|
|
141
|
+
const rootKey = normalizeWorkspaceId(project.rootPath);
|
|
142
|
+
const group = projectsByRoot.get(rootKey) ?? [];
|
|
143
|
+
group.push(project);
|
|
144
|
+
projectsByRoot.set(rootKey, group);
|
|
145
|
+
}
|
|
146
|
+
for (const duplicates of projectsByRoot.values()) {
|
|
147
|
+
if (duplicates.length < 2) {
|
|
148
|
+
continue;
|
|
149
|
+
}
|
|
150
|
+
const canonical = chooseCanonicalProject(duplicates);
|
|
151
|
+
const duplicateProjects = duplicates.filter((project) => project.projectId !== canonical.projectId);
|
|
152
|
+
await this.mergeDuplicateProjectCustomName(canonical, duplicateProjects, changes);
|
|
153
|
+
await Promise.all(duplicateProjects.flatMap((project) => (workspacesByProject.get(project.projectId) ?? []).map(async (workspace) => {
|
|
154
|
+
const timestamp = new Date().toISOString();
|
|
155
|
+
const updatedWorkspace = {
|
|
156
|
+
...workspace,
|
|
157
|
+
projectId: canonical.projectId,
|
|
158
|
+
updatedAt: timestamp,
|
|
159
|
+
};
|
|
160
|
+
await this.workspaceRegistry.upsert(updatedWorkspace);
|
|
161
|
+
changes.push({
|
|
162
|
+
kind: "workspace_updated",
|
|
163
|
+
workspaceId: workspace.workspaceId,
|
|
164
|
+
directory: workspace.cwd,
|
|
165
|
+
fields: {
|
|
166
|
+
projectId: canonical.projectId,
|
|
167
|
+
},
|
|
168
|
+
});
|
|
169
|
+
const canonicalSiblings = workspacesByProject.get(canonical.projectId) ?? [];
|
|
170
|
+
canonicalSiblings.push(updatedWorkspace);
|
|
171
|
+
workspacesByProject.set(canonical.projectId, canonicalSiblings);
|
|
172
|
+
})));
|
|
173
|
+
for (const project of duplicateProjects) {
|
|
174
|
+
workspacesByProject.set(project.projectId, []);
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
async mergeDuplicateProjectCustomName(canonical, duplicateProjects, changes) {
|
|
179
|
+
if (canonical.customName) {
|
|
180
|
+
return;
|
|
181
|
+
}
|
|
182
|
+
const customName = duplicateProjects.find((project) => project.customName)?.customName ?? null;
|
|
183
|
+
if (!customName) {
|
|
184
|
+
return;
|
|
185
|
+
}
|
|
186
|
+
const timestamp = new Date().toISOString();
|
|
187
|
+
await this.projectRegistry.upsert({
|
|
188
|
+
...canonical,
|
|
189
|
+
customName,
|
|
190
|
+
updatedAt: timestamp,
|
|
191
|
+
});
|
|
192
|
+
canonical.customName = customName;
|
|
193
|
+
changes.push({
|
|
194
|
+
kind: "project_updated",
|
|
195
|
+
projectId: canonical.projectId,
|
|
196
|
+
directory: canonical.rootPath,
|
|
197
|
+
fields: { customName },
|
|
198
|
+
});
|
|
199
|
+
}
|
|
111
200
|
async reconcileProject(project, siblings, changes) {
|
|
112
201
|
const directoryName = project.rootPath.split(/[\\/]/).findLast(Boolean) ?? project.rootPath;
|
|
113
202
|
const currentGit = await this.readWorkspaceGitMetadata(project.rootPath, directoryName);
|
|
@@ -140,20 +229,29 @@ export class WorkspaceReconciliationService {
|
|
|
140
229
|
await Promise.all(existingSiblings.map(async (workspace) => {
|
|
141
230
|
const wsDirName = workspace.cwd.split(/[\\/]/).findLast(Boolean) ?? workspace.cwd;
|
|
142
231
|
const wsGit = await this.readWorkspaceGitMetadata(workspace.cwd, wsDirName);
|
|
232
|
+
const expectedKind = deriveWorkspaceKindFromMetadata(wsGit);
|
|
233
|
+
const workspaceUpdates = {};
|
|
143
234
|
if (wsGit.projectKind === "git" && workspace.displayName !== wsGit.workspaceDisplayName) {
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
kind: "workspace_updated",
|
|
152
|
-
workspaceId: workspace.workspaceId,
|
|
153
|
-
directory: workspace.cwd,
|
|
154
|
-
fields: { displayName: wsGit.workspaceDisplayName },
|
|
155
|
-
});
|
|
235
|
+
workspaceUpdates.displayName = wsGit.workspaceDisplayName;
|
|
236
|
+
}
|
|
237
|
+
if (workspace.kind !== expectedKind) {
|
|
238
|
+
workspaceUpdates.kind = expectedKind;
|
|
239
|
+
}
|
|
240
|
+
if (Object.keys(workspaceUpdates).length === 0) {
|
|
241
|
+
return;
|
|
156
242
|
}
|
|
243
|
+
const timestamp = new Date().toISOString();
|
|
244
|
+
await this.workspaceRegistry.upsert({
|
|
245
|
+
...workspace,
|
|
246
|
+
...workspaceUpdates,
|
|
247
|
+
updatedAt: timestamp,
|
|
248
|
+
});
|
|
249
|
+
changes.push({
|
|
250
|
+
kind: "workspace_updated",
|
|
251
|
+
workspaceId: workspace.workspaceId,
|
|
252
|
+
directory: workspace.cwd,
|
|
253
|
+
fields: workspaceUpdates,
|
|
254
|
+
});
|
|
157
255
|
}));
|
|
158
256
|
}
|
|
159
257
|
async readWorkspaceGitMetadata(cwd, directoryName) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-reconciliation-service.js","sourceRoot":"","sources":["../../../src/server/workspace-reconciliation-service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"workspace-reconciliation-service.js","sourceRoot":"","sources":["../../../src/server/workspace-reconciliation-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ declare const PersistedProjectRecordSchema: z.ZodObject<{
|
|
|
6
6
|
rootPath: z.ZodString;
|
|
7
7
|
kind: z.ZodEnum<["git", "non_git"]>;
|
|
8
8
|
displayName: z.ZodString;
|
|
9
|
+
customName: z.ZodEffects<z.ZodOptional<z.ZodNullable<z.ZodString>>, string | null, string | null | undefined>;
|
|
9
10
|
createdAt: z.ZodString;
|
|
10
11
|
updatedAt: z.ZodString;
|
|
11
12
|
archivedAt: z.ZodNullable<z.ZodString>;
|
|
@@ -15,6 +16,7 @@ declare const PersistedProjectRecordSchema: z.ZodObject<{
|
|
|
15
16
|
kind: "git" | "non_git";
|
|
16
17
|
archivedAt: string | null;
|
|
17
18
|
projectId: string;
|
|
19
|
+
customName: string | null;
|
|
18
20
|
rootPath: string;
|
|
19
21
|
displayName: string;
|
|
20
22
|
}, {
|
|
@@ -25,6 +27,7 @@ declare const PersistedProjectRecordSchema: z.ZodObject<{
|
|
|
25
27
|
projectId: string;
|
|
26
28
|
rootPath: string;
|
|
27
29
|
displayName: string;
|
|
30
|
+
customName?: string | null | undefined;
|
|
28
31
|
}>;
|
|
29
32
|
declare const PersistedWorkspaceRecordSchema: z.ZodObject<{
|
|
30
33
|
workspaceId: z.ZodString;
|
|
@@ -86,7 +89,7 @@ declare class FileBackedRegistry<TRecord extends RegistryRecord> {
|
|
|
86
89
|
constructor(options: {
|
|
87
90
|
filePath: string;
|
|
88
91
|
logger: Logger;
|
|
89
|
-
schema: z.
|
|
92
|
+
schema: z.ZodType<TRecord, z.ZodTypeDef, unknown>;
|
|
90
93
|
getId: (record: TRecord) => string;
|
|
91
94
|
component: string;
|
|
92
95
|
});
|
|
@@ -112,10 +115,12 @@ export declare function createPersistedProjectRecord(input: {
|
|
|
112
115
|
rootPath: string;
|
|
113
116
|
kind: PersistedProjectKind;
|
|
114
117
|
displayName: string;
|
|
118
|
+
customName?: string | null;
|
|
115
119
|
createdAt: string;
|
|
116
120
|
updatedAt: string;
|
|
117
121
|
archivedAt?: string | null;
|
|
118
122
|
}): PersistedProjectRecord;
|
|
123
|
+
export declare function resolveProjectDisplayName(record: PersistedProjectRecord): string;
|
|
119
124
|
export declare function createPersistedWorkspaceRecord(input: {
|
|
120
125
|
workspaceId: string;
|
|
121
126
|
projectId: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-registry.d.ts","sourceRoot":"","sources":["../../../src/server/workspace-registry.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAElG,QAAA,MAAM,4BAA4B
|
|
1
|
+
{"version":3,"file":"workspace-registry.d.ts","sourceRoot":"","sources":["../../../src/server/workspace-registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,13 @@ const PersistedProjectRecordSchema = z.object({
|
|
|
7
7
|
rootPath: z.string(),
|
|
8
8
|
kind: z.enum(["git", "non_git"]),
|
|
9
9
|
displayName: z.string(),
|
|
10
|
+
// User-set override layered over the derived displayName. Reconciliation
|
|
11
|
+
// never touches this. Null means "use the derived name". Added for #987.
|
|
12
|
+
customName: z
|
|
13
|
+
.string()
|
|
14
|
+
.nullable()
|
|
15
|
+
.optional()
|
|
16
|
+
.transform((value) => value ?? null),
|
|
10
17
|
createdAt: z.string(),
|
|
11
18
|
updatedAt: z.string(),
|
|
12
19
|
archivedAt: z.string().nullable(),
|
|
@@ -139,9 +146,13 @@ export class FileBackedWorkspaceRegistry extends FileBackedRegistry {
|
|
|
139
146
|
export function createPersistedProjectRecord(input) {
|
|
140
147
|
return PersistedProjectRecordSchema.parse({
|
|
141
148
|
...input,
|
|
149
|
+
customName: input.customName ?? null,
|
|
142
150
|
archivedAt: input.archivedAt ?? null,
|
|
143
151
|
});
|
|
144
152
|
}
|
|
153
|
+
export function resolveProjectDisplayName(record) {
|
|
154
|
+
return record.customName ?? record.displayName;
|
|
155
|
+
}
|
|
145
156
|
export function createPersistedWorkspaceRecord(input) {
|
|
146
157
|
return PersistedWorkspaceRecordSchema.parse({
|
|
147
158
|
...input,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-registry.js","sourceRoot":"","sources":["../../../src/server/workspace-registry.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"workspace-registry.js","sourceRoot":"","sources":["../../../src/server/workspace-registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktree-session.d.ts","sourceRoot":"","sources":["../../../src/server/worktree-session.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"worktree-session.d.ts","sourceRoot":"","sources":["../../../src/server/worktree-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -264,6 +264,7 @@ export async function handleCreatePaseoWorktreeRequest(dependencies, request) {
|
|
|
264
264
|
try {
|
|
265
265
|
const createdWorktree = await dependencies.createPaseoWorktreeWorkflow({
|
|
266
266
|
cwd: request.cwd,
|
|
267
|
+
projectId: request.projectId,
|
|
267
268
|
worktreeSlug: request.worktreeSlug,
|
|
268
269
|
firstAgentContext: normalizeFirstAgentContext(request),
|
|
269
270
|
refName: request.refName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktree-session.js","sourceRoot":"","sources":["../../../src/server/worktree-session.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"worktree-session.js","sourceRoot":"","sources":["../../../src/server/worktree-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,6 +51,27 @@ export interface PullRequestCheck {
|
|
|
51
51
|
export type PullRequestChecksStatus = "none" | "pending" | "success" | "failure";
|
|
52
52
|
export type PullRequestReviewDecision = "approved" | "changes_requested" | "pending" | null;
|
|
53
53
|
export type PullRequestMergeable = "MERGEABLE" | "CONFLICTING" | "UNKNOWN";
|
|
54
|
+
export interface GitHubPullRequestStatusFacts {
|
|
55
|
+
mergeStateStatus: string | null;
|
|
56
|
+
autoMergeRequest: {
|
|
57
|
+
enabledAt: string | null;
|
|
58
|
+
mergeMethod: string | null;
|
|
59
|
+
enabledBy: string | null;
|
|
60
|
+
} | null;
|
|
61
|
+
viewerCanEnableAutoMerge: boolean;
|
|
62
|
+
viewerCanDisableAutoMerge: boolean;
|
|
63
|
+
viewerCanMergeAsAdmin: boolean;
|
|
64
|
+
viewerCanUpdateBranch: boolean;
|
|
65
|
+
repository: {
|
|
66
|
+
autoMergeAllowed: boolean;
|
|
67
|
+
mergeCommitAllowed: boolean;
|
|
68
|
+
squashMergeAllowed: boolean;
|
|
69
|
+
rebaseMergeAllowed: boolean;
|
|
70
|
+
viewerDefaultMergeMethod: string | null;
|
|
71
|
+
};
|
|
72
|
+
isMergeQueueEnabled: boolean;
|
|
73
|
+
isInMergeQueue: boolean;
|
|
74
|
+
}
|
|
54
75
|
export interface GitHubCurrentPullRequestStatus {
|
|
55
76
|
number?: number;
|
|
56
77
|
repoOwner?: string;
|
|
@@ -66,6 +87,7 @@ export interface GitHubCurrentPullRequestStatus {
|
|
|
66
87
|
checks: PullRequestCheck[];
|
|
67
88
|
checksStatus: PullRequestChecksStatus;
|
|
68
89
|
reviewDecision: PullRequestReviewDecision;
|
|
90
|
+
github?: GitHubPullRequestStatusFacts;
|
|
69
91
|
}
|
|
70
92
|
export type PullRequestTimelineReviewState = "approved" | "changes_requested" | "commented";
|
|
71
93
|
interface PullRequestTimelineItemBase {
|
|
@@ -100,14 +122,33 @@ export interface GitHubPullRequestCreateResult {
|
|
|
100
122
|
number: number;
|
|
101
123
|
}
|
|
102
124
|
export type GitHubPullRequestMergeMethod = "merge" | "squash" | "rebase";
|
|
125
|
+
export interface GitHubPullRequestCommandStatus {
|
|
126
|
+
mergeable?: PullRequestMergeable;
|
|
127
|
+
github?: GitHubPullRequestStatusFacts;
|
|
128
|
+
}
|
|
103
129
|
export interface MergeGitHubPullRequestOptions {
|
|
104
130
|
cwd: string;
|
|
105
131
|
prNumber: number;
|
|
106
132
|
mergeMethod: GitHubPullRequestMergeMethod;
|
|
133
|
+
status?: GitHubPullRequestCommandStatus | null;
|
|
134
|
+
}
|
|
135
|
+
export interface EnableGitHubPullRequestAutoMergeOptions {
|
|
136
|
+
cwd: string;
|
|
137
|
+
prNumber: number;
|
|
138
|
+
mergeMethod: GitHubPullRequestMergeMethod;
|
|
139
|
+
status?: GitHubPullRequestCommandStatus | null;
|
|
140
|
+
}
|
|
141
|
+
export interface DisableGitHubPullRequestAutoMergeOptions {
|
|
142
|
+
cwd: string;
|
|
143
|
+
prNumber: number;
|
|
144
|
+
status?: GitHubPullRequestCommandStatus | null;
|
|
107
145
|
}
|
|
108
146
|
export interface GitHubPullRequestMergeResult {
|
|
109
147
|
success: true;
|
|
110
148
|
}
|
|
149
|
+
export interface GitHubPullRequestAutoMergeResult {
|
|
150
|
+
success: true;
|
|
151
|
+
}
|
|
111
152
|
export type GitHubReadOptions = {
|
|
112
153
|
force?: false;
|
|
113
154
|
reason?: string;
|
|
@@ -179,6 +220,8 @@ export interface GitHubService {
|
|
|
179
220
|
searchIssuesAndPrs(options: SearchGitHubIssuesAndPrsOptions): Promise<GitHubSearchResult>;
|
|
180
221
|
createPullRequest(options: CreateGitHubPullRequestOptions): Promise<GitHubPullRequestCreateResult>;
|
|
181
222
|
mergePullRequest(options: MergeGitHubPullRequestOptions): Promise<GitHubPullRequestMergeResult>;
|
|
223
|
+
enablePullRequestAutoMerge(options: EnableGitHubPullRequestAutoMergeOptions): Promise<GitHubPullRequestAutoMergeResult>;
|
|
224
|
+
disablePullRequestAutoMerge(options: DisableGitHubPullRequestAutoMergeOptions): Promise<GitHubPullRequestAutoMergeResult>;
|
|
182
225
|
isAuthenticated(options: {
|
|
183
226
|
cwd: string;
|
|
184
227
|
} & GitHubReadOptions): Promise<boolean>;
|
|
@@ -226,6 +269,9 @@ interface CreateGitHubServiceOptions {
|
|
|
226
269
|
now?: () => number;
|
|
227
270
|
}
|
|
228
271
|
export declare function createGitHubService(options?: CreateGitHubServiceOptions): GitHubService;
|
|
272
|
+
export declare function assertPullRequestAutoMergeEnableReady(input: Pick<EnableGitHubPullRequestAutoMergeOptions, "mergeMethod" | "status">): void;
|
|
273
|
+
export declare function assertPullRequestAutoMergeDisableReady(input: Pick<DisableGitHubPullRequestAutoMergeOptions, "status">): void;
|
|
274
|
+
export declare function isPullRequestMergeMethodAllowed(repository: GitHubPullRequestStatusFacts["repository"], method: GitHubPullRequestMergeMethod): boolean;
|
|
229
275
|
export declare function computeGithubNextInterval(status: GitHubCurrentPullRequestStatus | null, consecutiveErrors: number): number;
|
|
230
276
|
export declare function parseStatusCheckRollup(value: unknown): PullRequestCheck[];
|
|
231
277
|
export declare function resolveGitHubRepo(cwd: string): Promise<string | null>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"github-service.d.ts","sourceRoot":"","sources":["../../../src/services/github-service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAO9D,eAAO,MAAM,4BAA4B,QAAS,CAAC;AACnD,eAAO,MAAM,4BAA4B,SAAU,CAAC;AACpD,eAAO,MAAM,gCAAgC,SAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"github-service.d.ts","sourceRoot":"","sources":["../../../src/services/github-service.ts"],"names":[],"mappings":"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"}
|