@straiffi/archon 1.8.14 → 1.8.15
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/client/assets/{ActivityView-DYDYyqIN.js → ActivityView-DpY9GZez.js} +1 -1
- package/dist/client/assets/{GitHubActionsDialog-jhi4GOyV.js → GitHubActionsDialog-BCr-hjvp.js} +1 -1
- package/dist/client/assets/{RepositoryGraphDialog-BZV0vHu6.js → RepositoryGraphDialog-_hm-x1Dx.js} +1 -1
- package/dist/client/assets/{VerificationDialog-Sc6e8AKH.js → VerificationDialog-CsjDzpE1.js} +1 -1
- package/dist/client/assets/{architectureDiagram-3BPJPVTR-DFbki8mi.js → architectureDiagram-3BPJPVTR-Dx7MJofM.js} +1 -1
- package/dist/client/assets/{blockDiagram-GPEHLZMM-BZFehG8P.js → blockDiagram-GPEHLZMM-CSSJR8F_.js} +1 -1
- package/dist/client/assets/{c4Diagram-AAUBKEIU-FVDXRu1t.js → c4Diagram-AAUBKEIU-C4F9969r.js} +1 -1
- package/dist/client/assets/channel-DVkhJzgx.js +1 -0
- package/dist/client/assets/{chunk-2J33WTMH-4tuVZaT0.js → chunk-2J33WTMH-23HW6i-y.js} +1 -1
- package/dist/client/assets/{chunk-3OPIFGDE-DSn14S35.js → chunk-3OPIFGDE-C3ZmRDMb.js} +1 -1
- package/dist/client/assets/{chunk-5ZQYHXKU-Cwx1KNjg.js → chunk-5ZQYHXKU-B_-UQvCg.js} +1 -1
- package/dist/client/assets/{chunk-727SXJPM-Odza4hes.js → chunk-727SXJPM-5Dua6u1B.js} +1 -1
- package/dist/client/assets/{chunk-AQP2D5EJ-BmVoQT7M.js → chunk-AQP2D5EJ-DcpcaFRO.js} +1 -1
- package/dist/client/assets/{chunk-CSCIHK7Q-Bg7Ktx0B.js → chunk-CSCIHK7Q-CLCpOw52.js} +1 -1
- package/dist/client/assets/{chunk-KSCS5N6A-2tnhar2x.js → chunk-KSCS5N6A-uOZFe2JI.js} +1 -1
- package/dist/client/assets/{chunk-L5ZTLDWV-dAyg8qMJ.js → chunk-L5ZTLDWV-DNnzSNoX.js} +1 -1
- package/dist/client/assets/{chunk-LZXEDZCA-0gElxrlR.js → chunk-LZXEDZCA-CSA3Xnoh.js} +2 -2
- package/dist/client/assets/{chunk-ND2GUHAM-Bu-8Lz91.js → chunk-ND2GUHAM-BQR5rD7w.js} +1 -1
- package/dist/client/assets/{chunk-NZK2D7GU-CInZFdzd.js → chunk-NZK2D7GU-DyIwcQYQ.js} +1 -1
- package/dist/client/assets/{chunk-O5CBEL6O-rAzpvdNR.js → chunk-O5CBEL6O-DfW60w5V.js} +1 -1
- package/dist/client/assets/{chunk-WU5MYG2G-DOOw2vq7.js → chunk-WU5MYG2G-CzMMPYdi.js} +1 -1
- package/dist/client/assets/classDiagram-4FO5ZUOK-6oZ93s5p.js +1 -0
- package/dist/client/assets/classDiagram-v2-Q7XG4LA2-DYO_YnkU.js +1 -0
- package/dist/client/assets/{dagre-BM42HDAG-Dgua1iuh.js → dagre-BM42HDAG-Ba7Pz-ZI.js} +1 -1
- package/dist/client/assets/{diagram-2AECGRRQ-odacwlwu.js → diagram-2AECGRRQ-BxYfgpZ6.js} +1 -1
- package/dist/client/assets/{diagram-5GNKFQAL-BiKjFmJ1.js → diagram-5GNKFQAL-Bc4-O-UJ.js} +1 -1
- package/dist/client/assets/{diagram-KO2AKTUF-CmYcvFri.js → diagram-KO2AKTUF-Ds1Lmrzm.js} +1 -1
- package/dist/client/assets/{diagram-LMA3HP47-ncx0RBuX.js → diagram-LMA3HP47-VFQabxKS.js} +1 -1
- package/dist/client/assets/{diagram-OG6HWLK6-DbchKIzw.js → diagram-OG6HWLK6-Baff59Zc.js} +1 -1
- package/dist/client/assets/{erDiagram-TEJ5UH35-CMnpvRyQ.js → erDiagram-TEJ5UH35-Da5zHjOK.js} +1 -1
- package/dist/client/assets/{flowDiagram-I6XJVG4X-Bi02_PK5.js → flowDiagram-I6XJVG4X-pdGMAuog.js} +1 -1
- package/dist/client/assets/{ganttDiagram-6RSMTGT7-BiS992US.js → ganttDiagram-6RSMTGT7-DjJGX0nm.js} +1 -1
- package/dist/client/assets/{gitGraphDiagram-PVQCEYII-Cc1hrTsT.js → gitGraphDiagram-PVQCEYII-kErlwtcT.js} +1 -1
- package/dist/client/assets/index-CS4TzG41.css +2 -0
- package/dist/client/assets/{index-B1gdJKwK.js → index-D5TEfELZ.js} +107 -107
- package/dist/client/assets/{infoDiagram-5YYISTIA-BKVfqJCe.js → infoDiagram-5YYISTIA-Bx78HhDi.js} +1 -1
- package/dist/client/assets/{ishikawaDiagram-YF4QCWOH-B-IbFOty.js → ishikawaDiagram-YF4QCWOH-BP0YQCMl.js} +1 -1
- package/dist/client/assets/{journeyDiagram-JHISSGLW-DAZBgAQW.js → journeyDiagram-JHISSGLW-DUgrCOuD.js} +1 -1
- package/dist/client/assets/{kanban-definition-UN3LZRKU-Bkr_fXev.js → kanban-definition-UN3LZRKU-K0Zc5_M8.js} +1 -1
- package/dist/client/assets/{line-CROuuXDO.js → line-Dtg-krjk.js} +1 -1
- package/dist/client/assets/{mermaid-parser.core-DrBw_Rsc.js → mermaid-parser.core-Dw5BI77W.js} +1 -1
- package/dist/client/assets/{mermaid.core-pPd6OYYj.js → mermaid.core-BE-qlWNj.js} +3 -3
- package/dist/client/assets/{mindmap-definition-RKZ34NQL-BXSd3TZU.js → mindmap-definition-RKZ34NQL-1Piz4H9I.js} +1 -1
- package/dist/client/assets/{pieDiagram-4H26LBE5-DoT7PIZC.js → pieDiagram-4H26LBE5-zlWdJ7lL.js} +1 -1
- package/dist/client/assets/{quadrantDiagram-W4KKPZXB-ycZkLowm.js → quadrantDiagram-W4KKPZXB-DRQY8Adp.js} +1 -1
- package/dist/client/assets/{requirementDiagram-4Y6WPE33-BPkO1yLu.js → requirementDiagram-4Y6WPE33-B8_GJFxl.js} +1 -1
- package/dist/client/assets/{sankeyDiagram-5OEKKPKP-D7AvhhCw.js → sankeyDiagram-5OEKKPKP-BaI0Njo8.js} +1 -1
- package/dist/client/assets/{sequenceDiagram-3UESZ5HK-C982swnH.js → sequenceDiagram-3UESZ5HK-DjqAXbRF.js} +1 -1
- package/dist/client/assets/{stateDiagram-AJRCARHV-xvJ3u8lc.js → stateDiagram-AJRCARHV-Ovr_3LeO.js} +1 -1
- package/dist/client/assets/stateDiagram-v2-BHNVJYJU-9pmeAorV.js +1 -0
- package/dist/client/assets/{timeline-definition-PNZ67QCA-D89qjzb5.js → timeline-definition-PNZ67QCA-DkczYKeZ.js} +1 -1
- package/dist/client/assets/{vennDiagram-CIIHVFJN-CoKeC__u.js → vennDiagram-CIIHVFJN-BZyo4ESi.js} +1 -1
- package/dist/client/assets/{wardleyDiagram-YWT4CUSO-DKhjzvSE.js → wardleyDiagram-YWT4CUSO-BEISrECX.js} +1 -1
- package/dist/client/assets/{xychartDiagram-2RQKCTM6-DFn9ass1.js → xychartDiagram-2RQKCTM6-CyNzGK7f.js} +1 -1
- package/dist/client/index.html +2 -2
- package/dist/server/db.js +2 -0
- package/dist/server/db.js.map +1 -1
- package/dist/server/index.js +11 -42
- package/dist/server/index.js.map +1 -1
- package/dist/server/lib/agent.js +61 -12
- package/dist/server/lib/agent.js.map +1 -1
- package/dist/server/lib/agentProvider.js +13 -3
- package/dist/server/lib/agentProvider.js.map +1 -1
- package/dist/server/lib/agentRuns.js +20 -9
- package/dist/server/lib/agentRuns.js.map +1 -1
- package/dist/server/lib/chatOperations.js +30 -1
- package/dist/server/lib/chatOperations.js.map +1 -1
- package/dist/server/lib/git.js +32 -1
- package/dist/server/lib/git.js.map +1 -1
- package/dist/server/lib/lightweightPrompt.js +1 -0
- package/dist/server/lib/lightweightPrompt.js.map +1 -1
- package/dist/server/lib/opencodeExecutionReliability.js +52 -0
- package/dist/server/lib/opencodeExecutionReliability.js.map +1 -0
- package/dist/server/lib/opencodeSessionOperations.js +21 -11
- package/dist/server/lib/opencodeSessionOperations.js.map +1 -1
- package/dist/server/lib/projectAutoConfig.js +1 -0
- package/dist/server/lib/projectAutoConfig.js.map +1 -1
- package/dist/server/lib/specArtifact.js +19 -0
- package/dist/server/lib/specArtifact.js.map +1 -1
- package/dist/server/lib/specBundleGroups.js +151 -0
- package/dist/server/lib/specBundleGroups.js.map +1 -0
- package/dist/server/lib/specExport.js +1 -0
- package/dist/server/lib/specExport.js.map +1 -1
- package/dist/server/lib/specFormatting.js +13 -0
- package/dist/server/lib/specFormatting.js.map +1 -1
- package/dist/server/lib/specReviewValidation.js +22 -1
- package/dist/server/lib/specReviewValidation.js.map +1 -1
- package/dist/server/lib/specReviews.js +1 -1
- package/dist/server/lib/specSections.js +8 -1
- package/dist/server/lib/specSections.js.map +1 -1
- package/dist/server/lib/specTicketMaterialization.js +119 -0
- package/dist/server/lib/specTicketMaterialization.js.map +1 -0
- package/dist/server/lib/specs.js +27 -5
- package/dist/server/lib/specs.js.map +1 -1
- package/dist/server/lib/types.js.map +1 -1
- package/dist/server/workers/followUp.js +25 -4
- package/dist/server/workers/followUp.js.map +1 -1
- package/dist/server/workers/plan.js +23 -2
- package/dist/server/workers/plan.js.map +1 -1
- package/dist/server/workers/review.js +29 -10
- package/dist/server/workers/review.js.map +1 -1
- package/dist/server/workers/specReview.js +7 -1
- package/dist/server/workers/specReview.js.map +1 -1
- package/dist/server/workers/specSession.js +68 -36
- package/dist/server/workers/specSession.js.map +1 -1
- package/package.json +1 -1
- package/dist/client/assets/channel-D1kOpezG.js +0 -1
- package/dist/client/assets/classDiagram-4FO5ZUOK-C253nwny.js +0 -1
- package/dist/client/assets/classDiagram-v2-Q7XG4LA2-DFgDA23g.js +0 -1
- package/dist/client/assets/index-CCQwWUKF.css +0 -2
- package/dist/client/assets/stateDiagram-v2-BHNVJYJU-BKQG8NCn.js +0 -1
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
|
|
1
|
+
import { markRetryableOpenCodeDatabaseLock, retryOpenCodeDatabaseLocks } from './opencodeExecutionReliability.js';
|
|
2
|
+
const runOneShotAgentOnce = (agentProvider, executionProvider, request) => {
|
|
2
3
|
const invocation = agentProvider.buildInvocation(request);
|
|
3
4
|
return new Promise((resolve, reject) => {
|
|
4
5
|
let handle;
|
|
@@ -42,7 +43,9 @@ export const runOneShotAgent = (agentProvider, executionProvider, request) => {
|
|
|
42
43
|
const stderr = Buffer.concat(stderrChunks).toString().trim();
|
|
43
44
|
const result = agentProvider.interpretOneShotOutput(Buffer.concat(stdoutChunks).toString(), stderr);
|
|
44
45
|
if (result.error) {
|
|
45
|
-
reject(
|
|
46
|
+
reject(request.retryOpenCodeDatabaseLocks && stdoutChunks.length === 0
|
|
47
|
+
? markRetryableOpenCodeDatabaseLock(result.error)
|
|
48
|
+
: result.error);
|
|
46
49
|
return;
|
|
47
50
|
}
|
|
48
51
|
if (code === 0 && result.output) {
|
|
@@ -50,7 +53,10 @@ export const runOneShotAgent = (agentProvider, executionProvider, request) => {
|
|
|
50
53
|
return;
|
|
51
54
|
}
|
|
52
55
|
const fallbackError = code === 0 ? request.emptyOutputMessage : `Process exited with code ${code}`;
|
|
53
|
-
|
|
56
|
+
const error = new Error(result.output || stderr || fallbackError);
|
|
57
|
+
reject(request.retryOpenCodeDatabaseLocks && stdoutChunks.length === 0
|
|
58
|
+
? markRetryableOpenCodeDatabaseLock(error)
|
|
59
|
+
: error);
|
|
54
60
|
});
|
|
55
61
|
handle.child.on('error', error => {
|
|
56
62
|
if (settled) {
|
|
@@ -61,4 +67,8 @@ export const runOneShotAgent = (agentProvider, executionProvider, request) => {
|
|
|
61
67
|
});
|
|
62
68
|
});
|
|
63
69
|
};
|
|
70
|
+
export const runOneShotAgent = (agentProvider, executionProvider, request) => {
|
|
71
|
+
const run = () => runOneShotAgentOnce(agentProvider, executionProvider, request);
|
|
72
|
+
return request.retryOpenCodeDatabaseLocks ? retryOpenCodeDatabaseLocks(run) : run();
|
|
73
|
+
};
|
|
64
74
|
//# sourceMappingURL=agentProvider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentProvider.js","sourceRoot":"","sources":["../../../server/lib/agentProvider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"agentProvider.js","sourceRoot":"","sources":["../../../server/lib/agentProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,38 +46,49 @@ const clearAgentRunsForParentStatement = db.prepare(`
|
|
|
46
46
|
WHERE parent_type = ? AND parent_id = ? AND execution_run_id IS NULL
|
|
47
47
|
`);
|
|
48
48
|
const listAgentRunsForParentStatement = db.prepare(`
|
|
49
|
-
WITH
|
|
49
|
+
WITH latest_active_execution_with_details AS (
|
|
50
50
|
SELECT run.id
|
|
51
51
|
FROM execution_runs run
|
|
52
|
+
WHERE run.status IN ('queued', 'running', 'waiting')
|
|
53
|
+
AND run.kind <> 'spec_review'
|
|
54
|
+
AND EXISTS (
|
|
55
|
+
SELECT 1
|
|
56
|
+
FROM agent_runs detail
|
|
57
|
+
WHERE detail.execution_run_id = run.id
|
|
58
|
+
AND detail.parent_type = ?
|
|
59
|
+
AND detail.parent_id = ?
|
|
60
|
+
)
|
|
61
|
+
ORDER BY run.created_at DESC, run.id DESC
|
|
62
|
+
LIMIT 1
|
|
63
|
+
), active_parent_execution AS (
|
|
64
|
+
SELECT 1
|
|
65
|
+
FROM execution_runs run
|
|
52
66
|
WHERE run.status IN ('queued', 'running', 'waiting')
|
|
53
67
|
AND run.kind <> 'spec_review'
|
|
54
68
|
AND (
|
|
55
69
|
EXISTS (
|
|
56
|
-
SELECT 1
|
|
57
|
-
FROM agent_runs detail
|
|
70
|
+
SELECT 1 FROM agent_runs detail
|
|
58
71
|
WHERE detail.execution_run_id = run.id
|
|
59
72
|
AND detail.parent_type = ?
|
|
60
73
|
AND detail.parent_id = ?
|
|
61
74
|
)
|
|
62
75
|
OR EXISTS (
|
|
63
|
-
SELECT 1
|
|
64
|
-
FROM execution_run_links link
|
|
76
|
+
SELECT 1 FROM execution_run_links link
|
|
65
77
|
WHERE link.execution_run_id = run.id
|
|
66
78
|
AND link.relationship = 'primary'
|
|
67
79
|
AND link.entity_type = ?
|
|
68
80
|
AND link.entity_id = ?
|
|
69
81
|
)
|
|
70
82
|
)
|
|
71
|
-
ORDER BY run.created_at DESC, run.id DESC
|
|
72
83
|
LIMIT 1
|
|
73
84
|
)
|
|
74
85
|
SELECT ${agentRunColumns}
|
|
75
86
|
FROM agent_runs
|
|
76
87
|
WHERE parent_type = ? AND parent_id = ?
|
|
77
88
|
AND (
|
|
78
|
-
execution_run_id = (SELECT id FROM
|
|
89
|
+
execution_run_id = (SELECT id FROM latest_active_execution_with_details)
|
|
79
90
|
OR (
|
|
80
|
-
NOT EXISTS (SELECT 1 FROM
|
|
91
|
+
NOT EXISTS (SELECT 1 FROM active_parent_execution)
|
|
81
92
|
AND execution_run_id IS NULL
|
|
82
93
|
AND agent_status = 'running'
|
|
83
94
|
AND completed_at IS NULL
|
|
@@ -256,7 +267,7 @@ export const listAgentRunsForParent = (parentType, parentId) => {
|
|
|
256
267
|
: parentType === 'chat'
|
|
257
268
|
? 'chat_session'
|
|
258
269
|
: 'spec_session';
|
|
259
|
-
return listAgentRunsForParentStatement.all(parentType, parentId, primaryEntityType, parentId, parentType, parentId)
|
|
270
|
+
return listAgentRunsForParentStatement.all(parentType, parentId, parentType, parentId, primaryEntityType, parentId, parentType, parentId)
|
|
260
271
|
.map(row => serializeAgentRun(row))
|
|
261
272
|
.filter((row) => row !== null);
|
|
262
273
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentRuns.js","sourceRoot":"","sources":["../../../server/lib/agentRuns.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAE,MAAM,UAAU,CAAA;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAGlD,MAAM,CAAC,MAAM,qCAAqC,GAAG,EAAE,GAAG,IAAI,CAAA;AA8B9D,MAAM,eAAe,GAAG;;;;CAIvB,CAAA;AAED,MAAM,uBAAuB,GAAG,EAAE,CAAC,OAAO,CAAC;;;;;CAK1C,CAAC,CAAA;AAEF,MAAM,8BAA8B,GAAG,EAAE,CAAC,OAAO,CAAC;;;;;;CAMjD,CAAC,CAAA;AAEF,MAAM,4BAA4B,GAAG,EAAE,CAAC,OAAO,CAAC;;;;;;;;;;CAU/C,CAAC,CAAA;AAEF,MAAM,gCAAgC,GAAG,EAAE,CAAC,OAAO,CAAC;;;;CAInD,CAAC,CAAA;AAEF,MAAM,4BAA4B,GAAG,EAAE,CAAC,OAAO,CAAC;;;;CAI/C,CAAC,CAAA;AAEF,MAAM,gCAAgC,GAAG,EAAE,CAAC,OAAO,CAAC;;;CAGnD,CAAC,CAAA;AAEF,MAAM,+BAA+B,GAAG,EAAE,CAAC,OAAO,CAAC
|
|
1
|
+
{"version":3,"file":"agentRuns.js","sourceRoot":"","sources":["../../../server/lib/agentRuns.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ import { normalizeClaudeModelId, normalizeModelId } from './models.js';
|
|
|
6
6
|
import { getProjectById } from './projects.js';
|
|
7
7
|
import { getPostBuildCheckSummary, hasActivePostBuildCheck } from './postBuildCheckRuns.js';
|
|
8
8
|
import { getSpecSession, getSpecSnapshot } from './specs.js';
|
|
9
|
+
import { MULTI_BUNDLE_SPEC_CHAT_UNAVAILABLE_ERROR, hasMultipleSpecBundleGroups } from './specBundleGroups.js';
|
|
9
10
|
import { resolveSessionTargetForExecution } from './sessionTargets.js';
|
|
10
11
|
import { createDeferredRealtimeBroadcaster } from './realtime.js';
|
|
11
12
|
import { normalizeSkillNames } from './skills.js';
|
|
@@ -27,6 +28,17 @@ const getProjectChatSession = (projectId, chatSessionId) => {
|
|
|
27
28
|
}
|
|
28
29
|
return chatSession;
|
|
29
30
|
};
|
|
31
|
+
const getTrustedOriginSpecSnapshotForChat = (projectId, chatSession) => {
|
|
32
|
+
if (!chatSession.origin_spec_session_id || !chatSession.origin_spec_snapshot_id) {
|
|
33
|
+
return null;
|
|
34
|
+
}
|
|
35
|
+
const specSession = getSpecSession(chatSession.origin_spec_session_id);
|
|
36
|
+
const specSnapshot = getSpecSnapshot(chatSession.origin_spec_snapshot_id);
|
|
37
|
+
if (!specSession || specSession.project_id !== projectId || specSnapshot?.spec_session_id !== specSession.id) {
|
|
38
|
+
return null;
|
|
39
|
+
}
|
|
40
|
+
return specSnapshot;
|
|
41
|
+
};
|
|
30
42
|
export const resolveChatMode = (value) => {
|
|
31
43
|
return value === 'plan' ? 'plan' : 'build';
|
|
32
44
|
};
|
|
@@ -70,6 +82,9 @@ export const createProjectChatSession = ({ projectId, payload, broadcaster, }) =
|
|
|
70
82
|
if (!targetResult.ok) {
|
|
71
83
|
return { ok: false, status: 409, error: targetResult.error };
|
|
72
84
|
}
|
|
85
|
+
if (mode === 'build' && hasMultipleSpecBundleGroups(specSnapshot.bundle_groups)) {
|
|
86
|
+
return { ok: false, status: 409, error: MULTI_BUNDLE_SPEC_CHAT_UNAVAILABLE_ERROR };
|
|
87
|
+
}
|
|
73
88
|
trustedOriginSpecSessionId = specSession.id;
|
|
74
89
|
trustedOriginSpecSnapshotId = specSnapshot.id;
|
|
75
90
|
externalSource = specSession.external_source ?? null;
|
|
@@ -109,6 +124,13 @@ export const submitProjectChatSessionMessage = ({ projectId, chatSessionId, payl
|
|
|
109
124
|
if (!existing) {
|
|
110
125
|
return { ok: false, status: 404, error: 'Not found' };
|
|
111
126
|
}
|
|
127
|
+
const executionMode = turnMode ?? existing.mode;
|
|
128
|
+
const originSpecSnapshot = executionMode === 'build'
|
|
129
|
+
? getTrustedOriginSpecSnapshotForChat(project.id, existing)
|
|
130
|
+
: null;
|
|
131
|
+
if (originSpecSnapshot && hasMultipleSpecBundleGroups(originSpecSnapshot.bundle_groups)) {
|
|
132
|
+
return { ok: false, status: 409, error: MULTI_BUNDLE_SPEC_CHAT_UNAVAILABLE_ERROR, value: existing };
|
|
133
|
+
}
|
|
112
134
|
if (getChatPostBuildSourceRunId(existing.id) || hasActivePostBuildCheck(project.id, 'chat_session', existing.id)) {
|
|
113
135
|
return {
|
|
114
136
|
ok: false,
|
|
@@ -354,7 +376,14 @@ export const updateProjectChatSessionMode = ({ projectId, chatSessionId, payload
|
|
|
354
376
|
if (hasPendingAskQuestionSet(existing.messages)) {
|
|
355
377
|
return { ok: false, status: 409, error: 'Resolve or dismiss the pending question set before continuing.', value: existing };
|
|
356
378
|
}
|
|
357
|
-
const
|
|
379
|
+
const nextMode = resolveChatMode(getPayloadValue(payload, 'mode'));
|
|
380
|
+
const originSpecSnapshot = nextMode === 'build'
|
|
381
|
+
? getTrustedOriginSpecSnapshotForChat(project.id, existing)
|
|
382
|
+
: null;
|
|
383
|
+
if (originSpecSnapshot && hasMultipleSpecBundleGroups(originSpecSnapshot.bundle_groups)) {
|
|
384
|
+
return { ok: false, status: 409, error: MULTI_BUNDLE_SPEC_CHAT_UNAVAILABLE_ERROR, value: existing };
|
|
385
|
+
}
|
|
386
|
+
const updatedSession = updateChatSessionMode(existing.id, nextMode);
|
|
358
387
|
if (!updatedSession) {
|
|
359
388
|
return { ok: false, status: 404, error: 'Not found' };
|
|
360
389
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chatOperations.js","sourceRoot":"","sources":["../../../server/lib/chatOperations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qCAAqC,EAAE,MAAM,kBAAkB,CAAA;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAC1C,OAAO,EAAE,iBAAiB,EAAE,2BAA2B,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAA;AAClH,OAAO,EAAE,uCAAuC,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAA;AACpG,OAAO,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAA;AAC3F,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAC5D,OAAO,EAAE,gCAAgC,EAAE,MAAM,qBAAqB,CAAA;AACtE,OAAO,EAAE,iCAAiC,EAAE,MAAM,eAAe,CAAA;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAA;AACrE,OAAO,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAA;AACjF,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAA;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAA;AAElE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAA;AAEzD,OAAO,EAAE,gCAAgC,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACpF,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAA;AACnE,OAAO,EAAE,6BAA6B,EAAE,wBAAwB,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAA;AAmBzH,MAAM,eAAe,GAAG,CAAC,OAA6B,EAAE,GAAW,EAAE,EAAE;IACrE,OAAO,OAAO,EAAE,CAAC,GAAG,CAAC,CAAA;AACvB,CAAC,CAAA;AAED,MAAM,qBAAqB,GAAG,CAAC,SAAiB,EAAE,aAAqB,EAAE,EAAE;IACzE,MAAM,WAAW,GAAG,cAAc,CAAC,aAAa,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAA;IAC5E,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QACzD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,KAAc,EAAmB,EAAE;IACjE,OAAO,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAA;AAC5C,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,KAAc,EAAY,EAAE;IAC1D,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;QACvB,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,EACvC,SAAS,EACT,OAAO,EACP,WAAW,GAKZ,EAA2C,EAAE;IAC5C,MAAM,OAAO,GAAG,cAAc,CAAC,SAAS,CAAC,CAAA;IACzC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,CAAA;IACvD,CAAC;IAED,MAAM,IAAI,GAAG,eAAe,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAA;IAC9D,MAAM,IAAI,GAAG,eAAe,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAA;IAC9D,MAAM,cAAc,GAAG,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IACxD,MAAM,QAAQ,GAAG,OAAO,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAA;IAC3F,MAAM,eAAe,GAAG,IAAI,KAAK,UAAU;QACzC,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,IAAI;QACpC,CAAC,CAAC,IAAI,KAAK,QAAQ;YACjB,CAAC,CAAC,sBAAsB,CAAC,QAAQ,CAAC,IAAI,IAAI;YAC1C,CAAC,CAAC,IAAI,CAAA;IACV,MAAM,gBAAgB,GAAG,eAAe,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;IAC5D,MAAM,iBAAiB,GAAG,IAAI,KAAK,UAAU,IAAI,eAAe,IAAI,OAAO,gBAAgB,KAAK,QAAQ;QACtG,CAAC,CAAC,gBAAgB,CAAC,IAAI,EAAE,IAAI,IAAI;QACjC,CAAC,CAAC,IAAI,KAAK,UAAU,IAAI,eAAe;YACtC,CAAC,CAAC,OAAO,CAAC,cAAc,IAAI,IAAI;YAChC,CAAC,CAAC,IAAI,CAAA;IAEV,MAAM,mBAAmB,GAAG,OAAO,eAAe,CAAC,OAAO,EAAE,qBAAqB,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAE,eAAe,CAAC,OAAO,EAAE,qBAAqB,CAAY,CAAC,CAAC,CAAC,IAAI,CAAA;IACpK,MAAM,oBAAoB,GAAG,OAAO,eAAe,CAAC,OAAO,EAAE,sBAAsB,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAE,eAAe,CAAC,OAAO,EAAE,sBAAsB,CAAY,CAAC,CAAC,CAAC,IAAI,CAAA;IAEvK,IAAI,0BAA0B,GAAG,IAAI,CAAA;IACrC,IAAI,2BAA2B,GAAG,IAAI,CAAA;IACtC,IAAI,cAAc,GAAG,IAAI,CAAA;IACzB,IAAI,cAAc,CAAA;IAClB,IAAI,mBAAmB,IAAI,oBAAoB,EAAE,CAAC;QAChD,MAAM,WAAW,GAAG,cAAc,CAAC,mBAAmB,CAAC,CAAA;QACvD,MAAM,YAAY,GAAG,eAAe,CAAC,oBAAoB,CAAC,CAAA;QAC1D,IAAI,WAAW,IAAI,WAAW,CAAC,UAAU,KAAK,OAAO,CAAC,EAAE,IAAI,YAAY,EAAE,eAAe,KAAK,WAAW,CAAC,EAAE,EAAE,CAAC;YAC7G,MAAM,YAAY,GAAG,gCAAgC,CAAC,WAAW,EAAE,OAAO,EAAE,cAAc,CAAC,CAAA;YAC3F,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC;gBACrB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE,CAAA;YAC9D,CAAC;YAED,0BAA0B,GAAG,WAAW,CAAC,EAAE,CAAA;YAC3C,2BAA2B,GAAG,YAAY,CAAC,EAAE,CAAA;YAC7C,cAAc,GAAG,WAAW,CAAC,eAAe,IAAI,IAAI,CAAA;YACpD,cAAc,GAAG;gBACf,UAAU,EAAE,WAAW,CAAC,WAAW;gBACnC,cAAc,EAAE,WAAW,CAAC,gBAAgB;gBAC5C,oBAAoB,EAAE,WAAW,CAAC,sBAAsB;gBACxD,mBAAmB,EAAE,WAAW,CAAC,qBAAqB;aACvD,CAAA;QACH,CAAC;IACH,CAAC;IAED,MAAM,WAAW,GAAG,iBAAiB,CAAC;QACpC,SAAS,EAAE,OAAO,CAAC,EAAE;QACrB,IAAI;QACJ,IAAI;QACJ,KAAK,EAAE,eAAe;QACtB,OAAO,EAAE,iBAAiB;QAC1B,MAAM,EAAE,mBAAmB,CAAC,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC/D,mBAAmB,EAAE,0BAA0B;QAC/C,oBAAoB,EAAE,2BAA2B;QACjD,cAAc;QACd,cAAc;KACf,CAAC,CAAA;IAEF,IAAI,IAAI,KAAK,OAAO,IAAI,cAAc,EAAE,CAAC;QACvC,wBAAwB,CAAC,OAAO,CAAC,EAAE,EAAE,cAAc,CAAC,CAAA;QACpD,yBAAyB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IACvC,CAAC;IAED,WAAW,CAAC,IAAI,CAAC,sBAAsB,EAAE,WAAW,CAAC,CAAA;IACrD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,CAAA;AACtD,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,EAC9C,SAAS,EACT,aAAa,EACb,OAAO,EACP,WAAW,EACX,UAAU,EACV,wBAAwB,EACxB,mBAAmB,EACnB,oBAAoB,EACpB,mBAAmB,EACnB,cAAc,EACd,QAAQ,EACR,kBAAkB,GAcnB,EAA2C,EAAE;IAC5C,MAAM,OAAO,GAAG,cAAc,CAAC,SAAS,CAAC,CAAA;IACzC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,CAAA;IACvD,CAAC;IAED,MAAM,QAAQ,GAAG,qBAAqB,CAAC,OAAO,CAAC,EAAE,EAAE,aAAa,CAAC,CAAA;IACjE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,CAAA;IACvD,CAAC;IACD,IAAI,2BAA2B,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,uBAAuB,CAAC,OAAO,CAAC,EAAE,EAAE,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;QACjH,OAAO;YACL,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,GAAG;YACX,KAAK,EAAE,iFAAiF;YACxF,KAAK,EAAE,qBAAqB,CAAC,OAAO,CAAC,EAAE,EAAE,aAAa,CAAC,IAAI,SAAS;SACrE,CAAA;IACH,CAAC;IACD,IAAI,CAAC,kBAAkB,IAAI,wBAAwB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,gEAAgE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAA;IAC7H,CAAC;IAED,MAAM,oBAAoB,GAAG,eAAe,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;IACpE,MAAM,WAAW,GAAG,OAAO,oBAAoB,KAAK,QAAQ,CAAC,CAAC,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IAE/F,MAAM,sBAAsB,GAAG,eAAe,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAA;IACzE,IAAI,sBAAsB,KAAK,SAAS,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,sBAAsB,CAAC,IAAI,sBAAsB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,EAAE,CAAC;QACxJ,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,6CAA6C,EAAE,CAAA;IACzF,CAAC;IAED,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,sBAAsB,CAAC;QACzD,CAAC,CAAC,sBAAsB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;QACnE,CAAC,CAAC,EAAE,CAAA;IACN,MAAM,mBAAmB,GAAG,mBAAmB;QAC7C,CAAC,CAAC,EAAE,EAAE,EAAE,IAAa,EAAE,WAAW,EAAE,mBAAmB,EAAE;QACzD,CAAC,CAAC,qCAAqC,CAAC,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,EAAE,aAAa,EAAE,CAAC,CAAA;IACxF,IAAI,CAAC,mBAAmB,CAAC,EAAE,EAAE,CAAC;QAC5B,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,mBAAmB,CAAC,KAAK,EAAE,CAAA;IACrE,CAAC;IACD,IAAI,CAAC,WAAW,IAAI,mBAAmB,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,2CAA2C,EAAE,CAAA;IACvF,CAAC;IAED,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IACpE,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,EAAE,CAAC;QACvC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,gBAAgB,CAAC,yBAAyB,IAAI,6BAA6B,EAAE,CAAA;IACvH,CAAC;IAED,IAAI,CAAC,uCAAuC,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC;QAChE,OAAO;YACL,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,GAAG;YACX,KAAK,EAAE,2GAA2G;SACnH,CAAA;IACH,CAAC;IAED,MAAM,cAAc,GAAG,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IACxD,MAAM,QAAQ,GAAG,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;IACrI,MAAM,YAAY,GAAG,cAAc,EAAE,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAA;IAC1D,MAAM,eAAe,GAAG,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,eAAe,CAAC,OAAO,EAAE,SAAS,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,EAAE,SAAS,CAAW,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;IACpM,MAAM,cAAc,GAAG,cAAc,EAAE,MAAM,IAAI,mBAAmB,CAAC,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAA;IACxG,MAAM,gBAAgB,GAAG,iCAAiC,CAAC,WAAW,CAAC,CAAA;IACvE,IAAI,gBAAkC,CAAA;IACtC,IAAI,CAAC;QACH,gBAAgB,GAAG,2BAA2B,CAAC,WAAW,CAAC,EAAE;YAC3D,MAAM,YAAY,GAAG,WAAW,CAAC,kBAAkB,CAAC;gBACtD,SAAS,EAAE,OAAO,CAAC,EAAE;gBACrB,IAAI,EAAE,WAAW;gBACjB,YAAY,EAAE,QAAQ;gBACtB,eAAe,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE;gBACjF,KAAK,EAAE,wBAAwB,CAAC,CAAC,CAAC,CAAC;wBACjC,UAAU,EAAE,cAAc;wBAC1B,QAAQ,EAAE,wBAAwB;wBAClC,YAAY,EAAE,SAAS;wBACvB,cAAc,EAAE,EAAE,UAAU,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE;qBACtE,CAAC,CAAC,CAAC,CAAC,EAAE;gBACP,WAAW,EAAE,UAAU,EAAE,SAAS;gBAClC,WAAW,EAAE,UAAU,EAAE,iBAAiB;gBAC1C,YAAY,EAAE,UAAU,EAAE,gBAAgB;gBAC1C,QAAQ,EAAE;oBACR,UAAU,EAAE,QAAQ,IAAI,QAAQ,CAAC,IAAI;oBACrC,UAAU,EAAE,YAAY;oBACxB,WAAW,EAAE,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI;oBAC3D,aAAa,EAAE,eAAe;oBAC9B,YAAY,EAAE,cAAc;oBAC5B,sBAAsB,EAAE,mBAAmB,CAAC,WAAW,CAAC,MAAM;iBAC/D;gBACD,SAAS,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,mBAAmB;aAC5E,CAAC,CAAA;YACF,kBAAkB,EAAE,MAAM,EAAE,CAAA;YAC5B,MAAM,OAAO,GAAqB;gBAChC,KAAK,EAAE,YAAY,CAAC,EAAE;gBACtB,aAAa,EAAE,YAAY,CAAC,cAAc;gBAC1C,SAAS,EAAE,YAAY,CAAC,UAAU;gBAClC,IAAI,EAAE,YAAY,CAAC,IAAI;aACxB,CAAA;YACD,MAAM,QAAQ,GAAG,oBAAoB,CAAC;gBACtC,aAAa,EAAE,QAAQ,CAAC,EAAE;gBAC1B,WAAW;gBACX,WAAW,EAAE,mBAAmB,CAAC,WAAW;gBAC5C,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI;gBACrD,OAAO,EAAE,eAAe;gBACxB,MAAM,EAAE,cAAc;gBACpB,EAAE,EAAE,gBAAgB,CAAC,WAAW;gBAChC,gBAAgB,EAAE,OAAO;gBAC3B,wBAAwB;gBACxB,oBAAoB;gBACpB,mBAAmB;gBACnB,QAAQ,EAAE,QAAQ,IAAI,QAAQ,CAAC,IAAI;aAClC,CAAC,CAAA;YACF,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAA;YAC1D,CAAC;YACD,OAAO,OAAO,CAAA;QAChB,CAAC,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAA;QAChC,gBAAgB,CAAC,KAAK,EAAE,CAAA;IAC1B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,gBAAgB,CAAC,OAAO,EAAE,CAAA;QAC1B,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACtE,MAAM,WAAW,GAAG,uBAAuB,CAAC,KAAK,EAAE,wBAAwB,CAAC,CAAA;QAC5E,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,KAAK,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAA;QAC7I,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,qBAAqB,CAAC,OAAO,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,CAAC,IAAI,QAAQ,EAAE,CAAA;IACjH,CAAC;IAED,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,qBAAqB,CAAC,OAAO,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAA;AACzF,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,EAC1C,SAAS,EACT,aAAa,EACb,WAAW,EACX,WAAW,EACX,SAAS,EACT,eAAe,EACf,WAAW,EACX,kBAAkB,EAClB,aAAa,GAWd,EAA2C,EAAE;IAC5C,MAAM,OAAO,GAAG,cAAc,CAAC,SAAS,CAAC,CAAA;IACzC,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IACjF,MAAM,aAAa,GAAG,OAAO;QAC3B,CAAC,CAAC,0BAA0B,CAAC,SAAS,EAAE,WAAW,EAAE,cAAc,EAAE,aAAa,CAAC;QACnF,CAAC,CAAC,KAAK,CAAA;IACT,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;QACzB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,CAAA;IACvD,CAAC;IACD,MAAM,2BAA2B,GAAG,2BAA2B,CAAC,aAAa,CAAC,CAAA;IAC9E,IACE,CAAC,aAAa;WACX,OAAO,CAAC,IAAI,KAAK,OAAO;WACxB,CAAC,OAAO,CAAC,YAAY,KAAK,SAAS,IAAI,CAAC,2BAA2B,CAAC,EACvE,CAAC;QACD,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,0CAA0C,EAAE,KAAK,EAAE,OAAO,EAAE,CAAA;IACtG,CAAC;IACD,MAAM,MAAM,GAAG,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IACzD,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;QAC7B,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,8CAA8C,EAAE,KAAK,EAAE,OAAO,EAAE,CAAA;IAC1G,CAAC;IAED,MAAM,gBAAgB,GAAG,iCAAiC,CAAC,WAAW,CAAC,CAAA;IACvE,IAAI,CAAC;QACH,2BAA2B,CAAC,WAAW,CAAC,EAAE;YACxC,MAAM,YAAY,GAAG,WAAW,CAAC,kBAAkB,CAAC;gBAClD,SAAS;gBACT,IAAI,EAAE,WAAW;gBACjB,YAAY,EAAE,QAAQ;gBACtB,eAAe,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE;gBAC/E,KAAK,EAAE,MAAM,CAAC,gBAAgB;oBAC5B,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,gBAAgB,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;oBACxF,CAAC,CAAC,EAAE;gBACN,WAAW,EAAE,YAAY;gBACzB,WAAW;gBACX,QAAQ,EAAE;oBACR,UAAU,EAAE,OAAO;oBACnB,UAAU,EAAE,SAAS,CAAC,IAAI;oBAC1B,WAAW,EAAE,SAAS,CAAC,KAAK;oBAC5B,aAAa,EAAE,SAAS,CAAC,OAAO;oBAChC,YAAY,EAAE,SAAS,CAAC,MAAM;oBAC9B,eAAe,EAAE,IAAI;iBACtB;gBACD,SAAS,EAAE,mBAAmB;aAC/B,CAAC,CAAA;YACF,MAAM,OAAO,GAAqB;gBAChC,KAAK,EAAE,YAAY,CAAC,EAAE;gBACtB,aAAa,EAAE,YAAY,CAAC,cAAc;gBAC1C,SAAS;gBACT,IAAI,EAAE,YAAY,CAAC,IAAI;aACxB,CAAA;YACD,kBAAkB,CAAC,OAAO,CAAC,CAAA;YAC3B,MAAM,QAAQ,GAAG,oBAAoB,CAAC;gBACpC,aAAa,EAAE,OAAO,CAAC,EAAE;gBACzB,WAAW;gBACX,IAAI,EAAE,SAAS,CAAC,IAAI;gBACpB,KAAK,EAAE,SAAS,CAAC,KAAK;gBACtB,OAAO,EAAE,SAAS,CAAC,OAAO;gBAC1B,MAAM,EAAE,SAAS,CAAC,MAAM;gBACxB,EAAE,EAAE,gBAAgB,CAAC,WAAW;gBAChC,gBAAgB,EAAE,OAAO;gBACzB,QAAQ,EAAE,OAAO;gBACjB,eAAe;gBACf,oBAAoB,EAAE,aAAa;aACpC,CAAC,CAAA;YACF,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAA;YAC/D,CAAC;QACH,CAAC,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAA;QAChC,gBAAgB,CAAC,KAAK,EAAE,CAAA;IAC1B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,gBAAgB,CAAC,OAAO,EAAE,CAAA;QAC1B,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAA;IAClH,CAAC;IACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,qBAAqB,CAAC,SAAS,EAAE,aAAa,CAAC,EAAE,CAAA;AAC1F,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,iCAAiC,GAAG,CAAC,EAChD,SAAS,EACT,aAAa,EACb,SAAS,EACT,OAAO,EACP,WAAW,GAOZ,EAA2C,EAAE;IAC5C,MAAM,OAAO,GAAG,qBAAqB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;IAC/D,MAAM,OAAO,GAAG,cAAc,CAAC,SAAS,CAAC,CAAA;IACzC,MAAM,GAAG,GAAG,OAAO,EAAE,QAAQ,EAAE,YAAY,CAAA;IAC3C,MAAM,KAAK,GAAG,OAAO,OAAO,EAAE,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAA;IACvE,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,eAAe,KAAK,OAAO,CAAC,EAAE,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,IAAI,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACpJ,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,2CAA2C,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAA;IACvK,CAAC;IACD,MAAM,MAAM,GAAG,OAAO,EAAE,WAAW,KAAK,IAAI;QAC1C,CAAC,CAAC,EAAE,EAAE,EAAE,IAAa,EAAE,WAAW,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,WAAoB,EAAE,CAAC,CAAC,EAAE;QACjH,CAAC,CAAC,2BAA2B,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,CAAC,CAAA;IAC1D,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;QACf,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAA;IACxD,CAAC;IACD,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,KAAK,UAAU,CAAC,CAAA;IAC1F,MAAM,OAAO,GAAG,EAAE,GAAG,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,UAAmB,CAAC,CAAC,CAAC,WAAoB,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,CAAA;IAC5H,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,IAAI,CAAC,gCAAgC,CAAC,OAAO,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;YACzG,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,wCAAwC,EAAE,KAAK,EAAE,qBAAqB,CAAC,SAAS,EAAE,aAAa,CAAC,IAAI,OAAO,EAAE,CAAA;QACvJ,CAAC;QACD,MAAM,OAAO,GAAG,qBAAqB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;QAC/D,IAAI,OAAO,EAAE,CAAC;YACZ,WAAW,CAAC,IAAI,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAA;QACnD,CAAC;QACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,CAAA;IAClD,CAAC;IACD,MAAM,MAAM,GAAG,+BAA+B,CAAC;QAC7C,SAAS;QACT,aAAa;QACb,OAAO,EAAE,EAAE,WAAW,EAAE,6BAA6B,CAAC,GAAG,EAAE,MAAM,CAAC,WAAW,CAAC,EAAE;QAChF,WAAW;QACX,cAAc,EAAE;YACd,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,MAAM,EAAE,OAAO,CAAC,MAAM;SACvB;QACD,QAAQ,EAAE,MAAM;QAChB,kBAAkB,EAAE;YAClB,MAAM,EAAE,GAAG,EAAE;gBACX,IAAI,CAAC,gCAAgC,CAAC,OAAO,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;oBACzG,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;gBAC3D,CAAC;YACH,CAAC;SACF;KACF,CAAC,CAAA;IACF,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,EAC3C,SAAS,EACT,aAAa,EACb,OAAO,EACP,WAAW,GAMZ,EAA2C,EAAE;IAC5C,MAAM,OAAO,GAAG,cAAc,CAAC,SAAS,CAAC,CAAA;IACzC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,CAAA;IACvD,CAAC;IAED,MAAM,QAAQ,GAAG,qBAAqB,CAAC,OAAO,CAAC,EAAE,EAAE,aAAa,CAAC,CAAA;IACjE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,CAAA;IACvD,CAAC;IACD,IAAI,wBAAwB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QAChD,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,gEAAgE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAA;IAC7H,CAAC;IAED,MAAM,cAAc,GAAG,qBAAqB,CAAC,QAAQ,CAAC,EAAE,EAAE,eAAe,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;IAC5G,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,CAAA;IACvD,CAAC;IAED,WAAW,CAAC,IAAI,CAAC,sBAAsB,EAAE,cAAc,CAAC,CAAA;IACxD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,cAAc,EAAE,CAAA;AACzD,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,8BAA8B,GAAG,KAAK,EAAE,EACnD,SAAS,EACT,aAAa,EACb,WAAW,GAKZ,EAA8C,EAAE;IAC/C,MAAM,OAAO,GAAG,cAAc,CAAC,SAAS,CAAC,CAAA;IACzC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,CAAA;IACvD,CAAC;IAED,MAAM,WAAW,GAAG,qBAAqB,CAAC,OAAO,CAAC,EAAE,EAAE,aAAa,CAAC,CAAA;IACpE,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,CAAA;IACvD,CAAC;IAED,MAAM,OAAO,GAAG,wBAAwB,CAAC,OAAO,CAAC,EAAE,EAAE,cAAc,EAAE,WAAW,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAA;IAC9F,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;QACxC,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAA;QAC9D,MAAM,gBAAgB,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,gBAAgB,EAAE,WAAW,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE,CAAC,CAAA;QACtG,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAA;IACvD,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;IACnD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,iDAAiD,EAAE,CAAA;IAC7F,CAAC;IAED,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAA;AACvD,CAAC,CAAA;AACD,OAAO,EAAE,MAAM,UAAU,CAAA"}
|
|
1
|
+
{"version":3,"file":"chatOperations.js","sourceRoot":"","sources":["../../../server/lib/chatOperations.ts"],"names":[],"mappings":"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"}
|
package/dist/server/lib/git.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { execFile, execFileSync } from 'child_process';
|
|
2
2
|
import { createHash } from 'crypto';
|
|
3
|
-
import { cpSync, existsSync, lstatSync, mkdirSync, mkdtempSync, rmSync, statSync, symlinkSync } from 'fs';
|
|
3
|
+
import { cpSync, existsSync, lstatSync, mkdirSync, mkdtempSync, readdirSync, rmSync, statSync, symlinkSync } from 'fs';
|
|
4
4
|
import { cp as cpAsync, lstat as lstatAsync, mkdir as mkdirAsync, stat as statAsync, symlink as symlinkAsync } from 'fs/promises';
|
|
5
5
|
import { tmpdir } from 'os';
|
|
6
6
|
import { dirname, isAbsolute, join, relative, resolve } from 'path';
|
|
@@ -1178,6 +1178,37 @@ export const hasKnownBranchRef = (branch, project) => {
|
|
|
1178
1178
|
}
|
|
1179
1179
|
});
|
|
1180
1180
|
};
|
|
1181
|
+
export const hasKnownBranchOrWorktreeConflict = (branch, project) => {
|
|
1182
|
+
const repoPath = getRepoPath(project);
|
|
1183
|
+
const normalizedBranch = branch.toLowerCase();
|
|
1184
|
+
const knownRefs = runGitText(['for-each-ref', '--format=%(refname)', 'refs/heads', 'refs/remotes', 'refs/tags'], repoPath).split('\n').map(value => value.trim()).filter(Boolean);
|
|
1185
|
+
const conflictsWithBranchNamespace = (value) => {
|
|
1186
|
+
const normalizedValue = value.toLowerCase();
|
|
1187
|
+
return normalizedValue === normalizedBranch
|
|
1188
|
+
|| normalizedValue.startsWith(`${normalizedBranch}/`)
|
|
1189
|
+
|| normalizedBranch.startsWith(`${normalizedValue}/`);
|
|
1190
|
+
};
|
|
1191
|
+
const branchConflict = knownRefs.some(value => {
|
|
1192
|
+
const normalizedValue = value.startsWith('refs/heads/')
|
|
1193
|
+
? value.slice('refs/heads/'.length)
|
|
1194
|
+
: value.startsWith('refs/tags/')
|
|
1195
|
+
? value.slice('refs/tags/'.length)
|
|
1196
|
+
: value.startsWith('refs/remotes/')
|
|
1197
|
+
? value.slice('refs/remotes/'.length).split('/').slice(1).join('/')
|
|
1198
|
+
: value;
|
|
1199
|
+
return conflictsWithBranchNamespace(normalizedValue);
|
|
1200
|
+
});
|
|
1201
|
+
if (branchConflict || listWorktreeRecords(project).some(record => record.branch && conflictsWithBranchNamespace(record.branch))) {
|
|
1202
|
+
return true;
|
|
1203
|
+
}
|
|
1204
|
+
const worktreeBase = getWorktreeBase(project);
|
|
1205
|
+
try {
|
|
1206
|
+
return readdirSync(worktreeBase).some(entry => entry.toLowerCase() === normalizedBranch);
|
|
1207
|
+
}
|
|
1208
|
+
catch {
|
|
1209
|
+
return false;
|
|
1210
|
+
}
|
|
1211
|
+
};
|
|
1181
1212
|
export const listLocalBranches = (project = null) => {
|
|
1182
1213
|
const repoPath = getRepoPath(project);
|
|
1183
1214
|
const currentBranch = getProjectBranch(project, { includeDiffStats: false }).branch;
|