dsh-git-worktree 0.8.0 → 0.9.0
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/CHANGELOG.md +36 -0
- package/README.en.md +7 -5
- package/README.md +7 -5
- package/lib/adapters/git.js +86 -13
- package/lib/adapters/git.js.map +1 -1
- package/lib/adapters/initial-commit.d.ts +16 -0
- package/lib/adapters/initial-commit.js +112 -0
- package/lib/adapters/initial-commit.js.map +1 -0
- package/lib/adapters/lookup.js +21 -0
- package/lib/adapters/lookup.js.map +1 -1
- package/lib/client/WorktreeCreateRow.js +2 -1
- package/lib/client/WorktreeCreateRow.js.map +1 -1
- package/lib/client/WorktreeReviewRow.d.ts +1 -1
- package/lib/client/WorktreeReviewRow.js +2 -2
- package/lib/client/WorktreeReviewRow.js.map +1 -1
- package/lib/client/actions.d.ts +1 -5
- package/lib/client/actions.js.map +1 -1
- package/lib/client/console-remote/adapter.js +2 -0
- package/lib/client/console-remote/adapter.js.map +1 -1
- package/lib/client/pre-session/PreSessionWorktreeToggle.d.ts +2 -2
- package/lib/client/pre-session/PreSessionWorktreeToggle.js +92 -79
- package/lib/client/pre-session/PreSessionWorktreeToggle.js.map +1 -1
- package/lib/client/pre-session/controller.d.ts +3 -0
- package/lib/client/pre-session/controller.js +16 -4
- package/lib/client/pre-session/controller.js.map +1 -1
- package/lib/client/pre-session/harness-input.d.ts +13 -0
- package/lib/client/pre-session/harness-input.js +18 -0
- package/lib/client/pre-session/harness-input.js.map +1 -0
- package/lib/client/pre-session/index.d.ts +3 -3
- package/lib/client/pre-session/index.js +4 -3
- package/lib/client/pre-session/index.js.map +1 -1
- package/lib/client/review-console/PreflightStatus.js +3 -2
- package/lib/client/review-console/PreflightStatus.js.map +1 -1
- package/lib/client/review-console/ReviewActions.d.ts +4 -1
- package/lib/client/review-console/ReviewActions.js +73 -53
- package/lib/client/review-console/ReviewActions.js.map +1 -1
- package/lib/client/review-console/ReviewDetailsModal.d.ts +12 -0
- package/lib/client/review-console/ReviewDetailsModal.js +56 -0
- package/lib/client/review-console/ReviewDetailsModal.js.map +1 -0
- package/lib/client/review-console/ReviewIcon.d.ts +35 -0
- package/lib/client/review-console/ReviewIcon.js +14 -0
- package/lib/client/review-console/ReviewIcon.js.map +1 -0
- package/lib/client/review-console/WorktreeReviewPanel.d.ts +3 -7
- package/lib/client/review-console/WorktreeReviewPanel.js +8 -73
- package/lib/client/review-console/WorktreeReviewPanel.js.map +1 -1
- package/lib/client/review-console/review-console.styles.js +101 -23
- package/lib/client/review-console/review-console.styles.js.map +1 -1
- package/lib/client/styles.js +13 -10
- package/lib/client/styles.js.map +1 -1
- package/lib/client/target-console/TargetStatusAction.js +65 -46
- package/lib/client/target-console/TargetStatusAction.js.map +1 -1
- package/lib/client/target-console/WorktreeConsoleView.d.ts +2 -1
- package/lib/client/target-console/WorktreeConsoleView.js +5 -4
- package/lib/client/target-console/WorktreeConsoleView.js.map +1 -1
- package/lib/client/target-console/WorktreeManagerModal.js +1 -1
- package/lib/client/target-console/WorktreeManagerModal.js.map +1 -1
- package/lib/client/target-console/WorktreeReviewStatus.js +36 -81
- package/lib/client/target-console/WorktreeReviewStatus.js.map +1 -1
- package/lib/client/target-console/current-polling.d.ts +11 -0
- package/lib/client/target-console/current-polling.js +104 -0
- package/lib/client/target-console/current-polling.js.map +1 -0
- package/lib/client/target-console/target-console.styles.js +8 -0
- package/lib/client/target-console/target-console.styles.js.map +1 -1
- package/lib/client/workspace-sidebar/index.js +5 -2
- package/lib/client/workspace-sidebar/index.js.map +1 -1
- package/lib/client/workspace-sidebar/model.d.ts +3 -0
- package/lib/client/workspace-sidebar/model.js +83 -10
- package/lib/client/workspace-sidebar/model.js.map +1 -1
- package/lib/client.js +5608 -4004
- package/lib/console-contract.d.ts +20 -0
- package/lib/console-contract.js.map +1 -1
- package/lib/console-host/control-plane.d.ts +3 -1
- package/lib/console-host/control-plane.js +105 -15
- package/lib/console-host/control-plane.js.map +1 -1
- package/lib/console-host/service.d.ts +3 -1
- package/lib/console-host/service.js +12 -0
- package/lib/console-host/service.js.map +1 -1
- package/lib/console-remote/descriptors.js +3 -1
- package/lib/console-remote/descriptors.js.map +1 -1
- package/lib/console-remote/remote.d.ts +3 -1
- package/lib/console-remote/remote.js.map +1 -1
- package/lib/console-remote/schemas.d.ts +10 -2
- package/lib/console-remote/schemas.js +7 -0
- package/lib/console-remote/schemas.js.map +1 -1
- package/lib/i18n/client-messages.d.ts +168 -20
- package/lib/i18n/client-messages.js +71 -34
- package/lib/i18n/client-messages.js.map +1 -1
- package/lib/i18n/host-messages.d.ts +32 -0
- package/lib/i18n/host-messages.js +11 -0
- package/lib/i18n/host-messages.js.map +1 -1
- package/lib/ports.d.ts +15 -0
- package/lib/session-checkout-module.js +2 -0
- package/lib/session-checkout-module.js.map +1 -1
- package/package.json +2 -1
- package/scripts/check-publish.mjs +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorktreeReviewRow.js","sourceRoot":"","sources":["../../src/client/WorktreeReviewRow.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,uBAAuB,EAAyB,MAAM,WAAW,CAAA;AAC/F,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAG3C,OAAO,EAAE,eAAe,EAA8B,MAAM,YAAY,CAAA;AACxE,OAAO,EAAE,4BAA4B,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAA;AAC/G,OAAO,EACL,mBAAmB,GAGpB,MAAM,yCAAyC,CAAA;AAShD,SAAS,uBAAuB,CAAC,KAAoB,EAAE,IAAsB,uBAAuB;IAClG,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,KAAK,CAAA;IAChC,OAAO,qCAAqC,CAAC,IAAI,CAAC,KAAK,CAAC;WACnD,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,qCAAqC,CAAC,CAAC,CAAA;AAC/D,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"WorktreeReviewRow.js","sourceRoot":"","sources":["../../src/client/WorktreeReviewRow.tsx"],"names":[],"mappings":"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"}
|
package/lib/client/actions.d.ts
CHANGED
|
@@ -86,11 +86,7 @@ export interface WorktreeClientServices {
|
|
|
86
86
|
};
|
|
87
87
|
};
|
|
88
88
|
}
|
|
89
|
-
export
|
|
90
|
-
setDraft(text: string): void;
|
|
91
|
-
addImages(ids: readonly string[]): boolean;
|
|
92
|
-
removeImage(id: string): void;
|
|
93
|
-
}
|
|
89
|
+
export type PreSessionInput = import('./pre-session/harness-input.js').HarnessInputActions;
|
|
94
90
|
/** Additional public Harness faces used only by the blank-session preparation flow. */
|
|
95
91
|
export interface PreSessionWorktreeServices extends WorktreeClientServices {
|
|
96
92
|
sessions: ClientSessions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../src/client/actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../src/client/actions.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,6 +47,8 @@ export function createWorktreeConsoleRemoteAdapter(remote, getLanguage = () => '
|
|
|
47
47
|
sidebarTopology: () => invoke('sidebarTopology', locale => remote.sidebarTopology(locale)),
|
|
48
48
|
current: request => invoke('current', locale => remote.current(request.sessionId, locale)),
|
|
49
49
|
list: request => invoke('list', locale => remote.list(request.sessionId, request.needsAttention, request.includeDelivered, locale)),
|
|
50
|
+
preflightCreate: request => invoke('preflightCreate', locale => remote.preflightCreate(request.sourceSessionId, locale)),
|
|
51
|
+
createWithInitialCommit: request => invoke('createWithInitialCommit', locale => remote.createWithInitialCommit(request.sourceSessionId, request.confirmationToken, locale)),
|
|
50
52
|
create: request => invoke('create', locale => remote.create(request.sourceSessionId, locale)),
|
|
51
53
|
inspect: request => invoke('inspect', locale => remote.inspect(request.sessionId, request.checkoutId, locale)),
|
|
52
54
|
reviewDiff: request => invoke('reviewDiff', locale => remote.reviewDiff(request.sessionId, request.checkoutId, request.expectedRevision, request.expectedReviewId, locale)),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../src/client/console-remote/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAiB,MAAM,oBAAoB,CAAA;AACvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAA;
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../src/client/console-remote/adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,5 +12,5 @@ export interface PreSessionWorktreeToggleProps {
|
|
|
12
12
|
prepare(request: PreparePreSessionWorktreeRequest): Promise<WorktreeConsoleTargetDetails>;
|
|
13
13
|
};
|
|
14
14
|
}
|
|
15
|
-
/** Blank-session
|
|
16
|
-
export declare function PreSessionWorktreeToggle({ sessionId, session, input, inputActions, adapter, controller
|
|
15
|
+
/** Blank-session directory menu mounted in Harness's public composer tool row. */
|
|
16
|
+
export declare function PreSessionWorktreeToggle({ sessionId, session, input, inputActions, adapter, controller }: PreSessionWorktreeToggleProps): import("react").JSX.Element | null;
|
|
@@ -1,146 +1,159 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
2
|
+
import { ReviewIcon } from '../review-console/ReviewIcon.js';
|
|
2
3
|
import { useClientTranslator, defaultClientTranslator } from '../i18n.js';
|
|
3
|
-
import {
|
|
4
|
+
import { useEffect, useRef, useState } from 'react';
|
|
4
5
|
import { Modal } from '@deepseek-ai/dsh-client-ui-primitives';
|
|
5
6
|
function errorMessage(value) {
|
|
6
7
|
return value instanceof Error ? value.message : String(value);
|
|
7
8
|
}
|
|
8
9
|
function snapshotInput(input) {
|
|
9
|
-
return {
|
|
10
|
-
...input,
|
|
11
|
-
imageIds: [...input.imageIds],
|
|
12
|
-
occurrences: [...input.occurrences],
|
|
13
|
-
};
|
|
10
|
+
return { ...input, imageIds: [...input.imageIds], occurrences: [...input.occurrences] };
|
|
14
11
|
}
|
|
15
12
|
function confirmationDescription(input, t = defaultClientTranslator) {
|
|
16
|
-
const attachmentText = input.imageIds.length === 1
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
if (input.draft.trim() !== '' && input.imageIds.length > 0) {
|
|
20
|
-
return t("the.current.input.and.will.move.to.the", { p0: attachmentText });
|
|
21
|
-
}
|
|
13
|
+
const attachmentText = input.imageIds.length === 1 ? t('1.attachment') : t('attachments', { p0: input.imageIds.length });
|
|
14
|
+
if (input.draft.trim() !== '' && input.imageIds.length > 0)
|
|
15
|
+
return t('the.current.input.and.will.move.to.the', { p0: attachmentText });
|
|
22
16
|
if (input.imageIds.length > 0)
|
|
23
|
-
return t(
|
|
17
|
+
return t('will.move.to.the.new.worktree.session', { p0: attachmentText });
|
|
24
18
|
if (input.draft.trim() !== '')
|
|
25
|
-
return t(
|
|
26
|
-
return t(
|
|
19
|
+
return t('the.current.input.will.move.to.the.new');
|
|
20
|
+
return t('a.new.worktree.session.will.be.created.the');
|
|
27
21
|
}
|
|
28
|
-
/** Blank-session
|
|
29
|
-
export function PreSessionWorktreeToggle({ sessionId, session, input, inputActions, adapter, controller
|
|
22
|
+
/** Blank-session directory menu mounted in Harness's public composer tool row. */
|
|
23
|
+
export function PreSessionWorktreeToggle({ sessionId, session, input, inputActions, adapter, controller }) {
|
|
30
24
|
const t = useClientTranslator();
|
|
31
25
|
const [target, setTarget] = useState(null);
|
|
32
26
|
const [state, setState] = useState('loading');
|
|
33
27
|
const [error, setError] = useState(null);
|
|
34
|
-
const [
|
|
28
|
+
const [pending, setPending] = useState(null);
|
|
35
29
|
const latestInput = useRef(input);
|
|
36
30
|
latestInput.current = input;
|
|
37
31
|
const blank = session.composerPhase === 'blank';
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
setState('error');
|
|
50
|
-
setError(`${outcome.error.code}: ${outcome.error.message}`);
|
|
51
|
-
}
|
|
52
|
-
return;
|
|
53
|
-
}
|
|
54
|
-
setTarget(outcome.value.target);
|
|
55
|
-
setState('idle');
|
|
56
|
-
}, [adapter, sessionId]);
|
|
57
|
-
useEffect(() => {
|
|
58
|
-
if (!blank)
|
|
32
|
+
// Invalidate at render: an old continuation must never navigate or clear
|
|
33
|
+
// the newly selected Session's draft, even before effect cleanup runs.
|
|
34
|
+
const scopeRef = useRef({ sessionId, adapter, blank, alive: true, busy: false });
|
|
35
|
+
if (scopeRef.current.sessionId !== sessionId || scopeRef.current.adapter !== adapter || scopeRef.current.blank !== blank) {
|
|
36
|
+
scopeRef.current.alive = false;
|
|
37
|
+
scopeRef.current = { sessionId, adapter, blank, alive: true, busy: false };
|
|
38
|
+
}
|
|
39
|
+
const scope = scopeRef.current;
|
|
40
|
+
const isCurrent = () => scope.alive && scopeRef.current === scope;
|
|
41
|
+
const refreshCurrent = async () => {
|
|
42
|
+
if (scope.busy)
|
|
59
43
|
return;
|
|
60
|
-
|
|
61
|
-
setTarget(null);
|
|
62
|
-
setPendingInput(null);
|
|
44
|
+
scope.busy = true;
|
|
63
45
|
setState('loading');
|
|
64
46
|
setError(null);
|
|
65
|
-
|
|
66
|
-
|
|
47
|
+
try {
|
|
48
|
+
const outcome = await adapter.current({ sessionId });
|
|
49
|
+
if (!isCurrent())
|
|
67
50
|
return;
|
|
68
51
|
if (!outcome.ok) {
|
|
69
52
|
setTarget(null);
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
setError(null);
|
|
73
|
-
}
|
|
74
|
-
else {
|
|
75
|
-
setState('error');
|
|
76
|
-
setError(`${outcome.error.code}: ${outcome.error.message}`);
|
|
77
|
-
}
|
|
53
|
+
setState(outcome.error.code === 'not_git_repository' ? 'unsupported' : 'error');
|
|
54
|
+
setError(outcome.error.code === 'not_git_repository' ? null : `${outcome.error.code}: ${outcome.error.message}`);
|
|
78
55
|
return;
|
|
79
56
|
}
|
|
80
57
|
setTarget(outcome.value.target);
|
|
81
58
|
setState('idle');
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
59
|
+
}
|
|
60
|
+
catch (cause) {
|
|
61
|
+
if (!isCurrent())
|
|
62
|
+
return;
|
|
63
|
+
setTarget(null);
|
|
64
|
+
setState('error');
|
|
65
|
+
setError(errorMessage(cause));
|
|
66
|
+
}
|
|
67
|
+
finally {
|
|
68
|
+
scope.busy = false;
|
|
69
|
+
}
|
|
70
|
+
};
|
|
71
|
+
useEffect(() => {
|
|
72
|
+
scope.alive = true;
|
|
73
|
+
setTarget(null);
|
|
74
|
+
setPending(null);
|
|
75
|
+
if (blank)
|
|
76
|
+
void refreshCurrent();
|
|
77
|
+
return () => { scope.alive = false; };
|
|
78
|
+
}, [scope]);
|
|
86
79
|
if (!blank || state === 'loading' || state === 'unsupported')
|
|
87
80
|
return null;
|
|
88
81
|
if (target?.state === 'local' && !target.capabilities.create)
|
|
89
82
|
return null;
|
|
90
|
-
const selected = target
|
|
83
|
+
const selected = target !== null && target.state !== 'local';
|
|
91
84
|
const canCreate = target?.state === 'local' && target.capabilities.create;
|
|
92
85
|
const busy = state === 'preparing';
|
|
93
86
|
const retryingLookup = state === 'error' && target === null;
|
|
94
87
|
const disabled = busy || selected || (!canCreate && !retryingLookup) || input.phase !== 'plain';
|
|
95
|
-
const checked = selected || pendingInput !== null || state === 'preparing';
|
|
96
|
-
const status = state === 'preparing'
|
|
97
|
-
? t("creating")
|
|
98
|
-
: selected
|
|
99
|
-
? t("created")
|
|
100
|
-
: pendingInput !== null
|
|
101
|
-
? t("awaiting.confirmation")
|
|
102
|
-
: state === 'error'
|
|
103
|
-
? t("retry")
|
|
104
|
-
: 'Local';
|
|
105
88
|
const beginConfirmation = async () => {
|
|
106
|
-
if (disabled)
|
|
89
|
+
if (disabled || scope.busy || !isCurrent())
|
|
107
90
|
return;
|
|
108
91
|
if (retryingLookup) {
|
|
109
92
|
await refreshCurrent();
|
|
110
93
|
return;
|
|
111
94
|
}
|
|
95
|
+
scope.busy = true;
|
|
96
|
+
setState('preparing');
|
|
112
97
|
setError(null);
|
|
113
|
-
|
|
98
|
+
try {
|
|
99
|
+
const captured = snapshotInput(latestInput.current);
|
|
100
|
+
const outcome = adapter.preflightCreate ? await adapter.preflightCreate({ sourceSessionId: sessionId }) : null;
|
|
101
|
+
if (!isCurrent())
|
|
102
|
+
return;
|
|
103
|
+
if (outcome && !outcome.ok)
|
|
104
|
+
throw new Error(`${outcome.error.code}: ${outcome.error.message}`);
|
|
105
|
+
const result = outcome?.ok ? outcome.value : { kind: 'ready' };
|
|
106
|
+
setPending({ input: captured, kind: result.kind, token: result.kind === 'empty' ? result.confirmationToken : undefined });
|
|
107
|
+
setState('idle');
|
|
108
|
+
}
|
|
109
|
+
catch (cause) {
|
|
110
|
+
if (!isCurrent())
|
|
111
|
+
return;
|
|
112
|
+
setPending(null);
|
|
113
|
+
setState('error');
|
|
114
|
+
setError(errorMessage(cause));
|
|
115
|
+
}
|
|
116
|
+
finally {
|
|
117
|
+
scope.busy = false;
|
|
118
|
+
}
|
|
114
119
|
};
|
|
115
120
|
const cancelConfirmation = () => {
|
|
116
|
-
if (
|
|
121
|
+
if (scope.busy)
|
|
117
122
|
return;
|
|
118
|
-
|
|
123
|
+
setPending(null);
|
|
119
124
|
setError(null);
|
|
120
125
|
setState('idle');
|
|
121
126
|
};
|
|
122
127
|
const confirm = async () => {
|
|
123
|
-
|
|
124
|
-
if (captured === null || state === 'preparing')
|
|
128
|
+
if (pending === null || pending.kind === 'files' || scope.busy || !isCurrent())
|
|
125
129
|
return;
|
|
130
|
+
scope.busy = true;
|
|
126
131
|
setState('preparing');
|
|
127
132
|
setError(null);
|
|
133
|
+
const captured = pending;
|
|
128
134
|
try {
|
|
129
135
|
const prepared = await controller.prepare({
|
|
130
|
-
sessionId,
|
|
131
|
-
|
|
132
|
-
currentInput: () => latestInput.current,
|
|
133
|
-
inputActions,
|
|
136
|
+
sessionId, input: captured.input, currentInput: () => latestInput.current,
|
|
137
|
+
isCurrentSession: isCurrent, inputActions, initialCommitConfirmationToken: captured.token,
|
|
134
138
|
});
|
|
139
|
+
if (!isCurrent())
|
|
140
|
+
return;
|
|
135
141
|
setTarget(prepared);
|
|
136
|
-
|
|
142
|
+
setPending(null);
|
|
137
143
|
setState('idle');
|
|
138
144
|
}
|
|
139
145
|
catch (cause) {
|
|
146
|
+
if (!isCurrent())
|
|
147
|
+
return;
|
|
148
|
+
// Tokens are single-use, including when only the client handoff failed.
|
|
149
|
+
setPending(null);
|
|
140
150
|
setState('error');
|
|
141
151
|
setError(errorMessage(cause));
|
|
142
152
|
}
|
|
153
|
+
finally {
|
|
154
|
+
scope.busy = false;
|
|
155
|
+
}
|
|
143
156
|
};
|
|
144
|
-
return (_jsxs("span", { className: "dsh-wt-pre-session", "data-state": state, children: [_jsxs("button", { type: "button", role: "switch", "aria-
|
|
157
|
+
return (_jsxs("span", { className: "dsh-wt-pre-session", "data-state": state, children: [_jsxs("button", { type: "button", role: "switch", "aria-checked": selected, "aria-label": t('worktree'), "aria-describedby": error ? `dsh-wt-pre-session-error-${sessionId}` : undefined, className: "dsh-wt-pre-session-toggle", disabled: disabled, onClick: () => { void beginConfirmation(); }, children: [_jsx("span", { className: "dsh-wt-pre-session-check", "aria-hidden": "true", children: selected ? _jsx(ReviewIcon, { name: "confirm" }) : null }), _jsx("span", { children: t('worktree') })] }), error ? (_jsxs("span", { id: `dsh-wt-pre-session-error-${sessionId}`, className: "dsh-wt-pre-session-error", role: "alert", children: [error, " ", _jsxs("button", { type: "button", className: "dsh-wt-button", disabled: busy, onClick: () => { void beginConfirmation(); }, children: [_jsx(ReviewIcon, { name: "refresh" }), t('retry')] })] })) : null, _jsxs(Modal, { className: "dsh-wt-create-dialog", open: pending !== null, onClose: cancelConfirmation, title: pending?.kind === 'empty' ? t('pre.session.initial.title') : t('start.in.a.worktree'), closeLabel: t('close'), description: pending === null ? '' : pending.kind === 'empty' ? t('pre.session.initial.description') : pending.kind === 'files' ? t('pre.session.files.description') : confirmationDescription(pending.input, t), footer: (_jsxs(_Fragment, { children: [_jsx("button", { type: "button", className: "dsh-wt-button", disabled: busy, onClick: cancelConfirmation, children: t('cancel') }), pending?.kind !== 'files' ? _jsxs("button", { type: "button", className: "dsh-wt-button dsh-wt-primary", disabled: busy, onClick: () => { void confirm(); }, children: [_jsx(ReviewIcon, { name: "create" }), busy ? t('creating') : pending?.kind === 'empty' ? t('pre.session.initial.confirm') : t('create.and.switch')] }) : null] })), children: [pending?.kind === 'empty' ? _jsx("p", { className: "dsh-wt-pre-session-note", children: confirmationDescription(pending.input, t) }) : null, pending?.kind !== 'files' ? _jsx("p", { className: "dsh-wt-pre-session-note", children: t('the.local.session.will.not.receive.this.message') }) : null] })] }));
|
|
145
158
|
}
|
|
146
159
|
//# sourceMappingURL=PreSessionWorktreeToggle.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PreSessionWorktreeToggle.js","sourceRoot":"","sources":["../../../src/client/pre-session/PreSessionWorktreeToggle.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,uBAAuB,EAAyB,MAAM,YAAY,CAAA;AAChG,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"PreSessionWorktreeToggle.js","sourceRoot":"","sources":["../../../src/client/pre-session/PreSessionWorktreeToggle.tsx"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,9 @@ export interface PreparePreSessionWorktreeRequest {
|
|
|
20
20
|
/** Live source state used for the final compare-and-clear boundary. */
|
|
21
21
|
currentInput?: () => PreSessionDraftState;
|
|
22
22
|
inputActions: PreSessionDraftActions;
|
|
23
|
+
initialCommitConfirmationToken?: string;
|
|
24
|
+
/** Invalidated when the composer leaves its source Session. */
|
|
25
|
+
isCurrentSession?: () => boolean;
|
|
23
26
|
}
|
|
24
27
|
export declare class PreSessionWorktreeError extends Error {
|
|
25
28
|
readonly recoveryRequired: boolean;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { translatorForServices } from '../i18n.js';
|
|
2
|
+
import { adaptHarnessInputActions } from './harness-input.js';
|
|
2
3
|
export class PreSessionWorktreeError extends Error {
|
|
3
4
|
recoveryRequired;
|
|
4
5
|
constructor(message, recoveryRequired = false) {
|
|
@@ -15,7 +16,8 @@ function sameStrings(left, right) {
|
|
|
15
16
|
}
|
|
16
17
|
function sourceStillMatches(request) {
|
|
17
18
|
const current = request.currentInput?.() ?? request.input;
|
|
18
|
-
return
|
|
19
|
+
return request.isCurrentSession?.() !== false
|
|
20
|
+
&& current.phase === 'plain'
|
|
19
21
|
&& current.draft === request.input.draft
|
|
20
22
|
&& sameStrings(current.imageIds, request.input.imageIds)
|
|
21
23
|
&& current.occurrences.length === request.input.occurrences.length
|
|
@@ -47,6 +49,8 @@ export class PreSessionWorktreeController {
|
|
|
47
49
|
}
|
|
48
50
|
async run(request) {
|
|
49
51
|
const t = translatorForServices(this.services);
|
|
52
|
+
if (request.isCurrentSession?.() === false)
|
|
53
|
+
throw new PreSessionWorktreeError(t("pre.session.changed"));
|
|
50
54
|
if (request.input.phase !== 'plain') {
|
|
51
55
|
throw new PreSessionWorktreeError(t("the.draft.is.being.submitted.or.parsed.wait"));
|
|
52
56
|
}
|
|
@@ -59,7 +63,12 @@ export class PreSessionWorktreeController {
|
|
|
59
63
|
let workspaceId;
|
|
60
64
|
let actualSessionId;
|
|
61
65
|
try {
|
|
62
|
-
|
|
66
|
+
if (request.initialCommitConfirmationToken !== undefined && !this.adapter.createWithInitialCommit) {
|
|
67
|
+
throw new PreSessionWorktreeError(t("pre.session.initial.unavailable"));
|
|
68
|
+
}
|
|
69
|
+
const outcome = request.initialCommitConfirmationToken !== undefined
|
|
70
|
+
? await this.adapter.createWithInitialCommit({ sourceSessionId: request.sessionId, confirmationToken: request.initialCommitConfirmationToken })
|
|
71
|
+
: await this.adapter.create({ sourceSessionId: request.sessionId });
|
|
63
72
|
if (!outcome.ok)
|
|
64
73
|
throw new PreSessionWorktreeError(`${outcome.error.code}: ${outcome.error.message}`);
|
|
65
74
|
created = outcome.value;
|
|
@@ -79,7 +88,7 @@ export class PreSessionWorktreeController {
|
|
|
79
88
|
if (targetBinding?.ctx === undefined) {
|
|
80
89
|
throw new PreSessionWorktreeError(t("the.target.session.was.created.but.harness.has"));
|
|
81
90
|
}
|
|
82
|
-
const targetInput = this.services.conversation.input.for(targetBinding.ctx);
|
|
91
|
+
const targetInput = adaptHarnessInputActions(this.services.conversation.input.for(targetBinding.ctx));
|
|
83
92
|
if (!sourceStillMatches(request)) {
|
|
84
93
|
throw new PreSessionWorktreeError(t("the.local.draft.or.attachments.changed.after.confirmation"));
|
|
85
94
|
}
|
|
@@ -107,8 +116,11 @@ export class PreSessionWorktreeController {
|
|
|
107
116
|
return created.target;
|
|
108
117
|
}
|
|
109
118
|
catch (error) {
|
|
119
|
+
if (created !== undefined && request.initialCommitConfirmationToken !== undefined) {
|
|
120
|
+
error = new PreSessionWorktreeError(t("pre.session.initial.created.failure", { p0: messageOf(error) }));
|
|
121
|
+
}
|
|
110
122
|
if (created !== undefined) {
|
|
111
|
-
const cleaned = await this.rollback(request.sessionId, created.targetSessionId, created.target, workspaceId, actualSessionId);
|
|
123
|
+
const cleaned = await this.rollback(request.sessionId, created.targetSessionId, created.target, workspaceId, actualSessionId).catch(() => false);
|
|
112
124
|
if (!cleaned) {
|
|
113
125
|
throw new PreSessionWorktreeError(t("the.worktree.was.persisted.but.automatic.rollback.failed", { p0: messageOf(error) }), true);
|
|
114
126
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../src/client/pre-session/controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../src/client/pre-session/controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type { PreSessionDraftActions, PreSessionDraftState } from './controller.js';
|
|
2
|
+
/** Harness renamed the image-only composer API when adding general attachments. */
|
|
3
|
+
export type HarnessInputState = PreSessionDraftState | (Omit<PreSessionDraftState, 'imageIds'> & {
|
|
4
|
+
readonly attachmentIds: readonly string[];
|
|
5
|
+
});
|
|
6
|
+
export type HarnessInputActions = PreSessionDraftActions | {
|
|
7
|
+
setDraft(text: string): void;
|
|
8
|
+
addAttachments(ids: readonly string[]): boolean;
|
|
9
|
+
removeAttachment(id: string): void;
|
|
10
|
+
};
|
|
11
|
+
export declare function readHarnessInput(input: HarnessInputState): PreSessionDraftState;
|
|
12
|
+
/** Bind through the original receiver: target input faces may be class instances. */
|
|
13
|
+
export declare function adaptHarnessInputActions(input: HarnessInputActions): PreSessionDraftActions;
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
export function readHarnessInput(input) {
|
|
2
|
+
return {
|
|
3
|
+
...input,
|
|
4
|
+
imageIds: 'attachmentIds' in input ? input.attachmentIds : input.imageIds,
|
|
5
|
+
};
|
|
6
|
+
}
|
|
7
|
+
/** Bind through the original receiver: target input faces may be class instances. */
|
|
8
|
+
export function adaptHarnessInputActions(input) {
|
|
9
|
+
if ('addAttachments' in input) {
|
|
10
|
+
return {
|
|
11
|
+
setDraft: text => input.setDraft(text),
|
|
12
|
+
addImages: ids => input.addAttachments(ids),
|
|
13
|
+
removeImage: id => input.removeAttachment(id),
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
return input;
|
|
17
|
+
}
|
|
18
|
+
//# sourceMappingURL=harness-input.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"harness-input.js","sourceRoot":"","sources":["../../../src/client/pre-session/harness-input.ts"],"names":[],"mappings":"AAaA,MAAM,UAAU,gBAAgB,CAAC,KAAwB;IACvD,OAAO;QACL,GAAG,KAAK;QACR,QAAQ,EAAE,eAAe,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ;KAC1E,CAAA;AACH,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,wBAAwB,CAAC,KAA0B;IACjE,IAAI,gBAAgB,IAAI,KAAK,EAAE,CAAC;QAC9B,OAAO;YACL,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;YACtC,SAAS,EAAE,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC;YAC3C,WAAW,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE,CAAC;SAC9C,CAAA;IACH,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC"}
|
|
@@ -3,7 +3,7 @@ import type { SessionSnapshot } from '@deepseek-ai/dsh-api-session-controller/cl
|
|
|
3
3
|
import type { SnapshotSelectorHook } from '@deepseek-ai/dsh-client-store';
|
|
4
4
|
import type { WorktreeConsoleAdapter } from '../../console-contract.js';
|
|
5
5
|
import type { PreSessionWorktreeServices } from '../actions.js';
|
|
6
|
-
import { type
|
|
6
|
+
import { type HarnessInputActions, type HarnessInputState } from './harness-input.js';
|
|
7
7
|
/** rc.1 input.left has no owner snapshot props; snapshots come from standard hooks. */
|
|
8
8
|
export interface PreSessionSlotProps {
|
|
9
9
|
sessionId: string;
|
|
@@ -11,8 +11,8 @@ export interface PreSessionSlotProps {
|
|
|
11
11
|
useConversation: SnapshotSelectorHook<{
|
|
12
12
|
readonly activeTargets: ReadonlySet<string>;
|
|
13
13
|
}>;
|
|
14
|
-
useInput: SnapshotSelectorHook<
|
|
15
|
-
inputActions:
|
|
14
|
+
useInput: SnapshotSelectorHook<HarnessInputState>;
|
|
15
|
+
inputActions: HarnessInputActions;
|
|
16
16
|
}
|
|
17
17
|
export interface PreSessionSlotContextLike {
|
|
18
18
|
slots: {
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
2
|
import { createPreSessionWorktreeController } from './controller.js';
|
|
3
|
-
import { PreSessionWorktreeToggle
|
|
3
|
+
import { PreSessionWorktreeToggle } from './PreSessionWorktreeToggle.js';
|
|
4
|
+
import { adaptHarnessInputActions, readHarnessInput } from './harness-input.js';
|
|
4
5
|
/** Register the blank-session switch in Harness's public composer tool row. */
|
|
5
6
|
export function registerPreSessionWorktree(ctx, adapter, services) {
|
|
6
7
|
const controller = createPreSessionWorktreeController(adapter, services);
|
|
@@ -10,8 +11,8 @@ export function registerPreSessionWorktree(ctx, adapter, services) {
|
|
|
10
11
|
const sessionPhase = useSession(session => (!session.blank && !session.awaitingFirstTurn) || session.running
|
|
11
12
|
? 'active' : session.promptAttempted ? 'engaging' : 'blank');
|
|
12
13
|
const hasActiveTarget = useConversation(conversation => conversation.activeTargets.size > 0);
|
|
13
|
-
const input = useInput(snapshot => snapshot);
|
|
14
|
-
return _jsx(PreSessionWorktreeToggle, { sessionId: sessionId, session: { composerPhase: hasActiveTarget ? 'active' : sessionPhase }, input: input, inputActions: inputActions, adapter: adapter, controller: controller });
|
|
14
|
+
const input = readHarnessInput(useInput(snapshot => snapshot));
|
|
15
|
+
return _jsx(PreSessionWorktreeToggle, { sessionId: sessionId, session: { composerPhase: hasActiveTarget ? 'active' : sessionPhase }, input: input, inputActions: adaptHarnessInputActions(inputActions), adapter: adapter, controller: controller });
|
|
15
16
|
};
|
|
16
17
|
ctx.slots.inject('conversation.input.left', () => ctx.slots.register({
|
|
17
18
|
name: 'conversation.input.left',
|