dsh-git-worktree 0.7.5 → 0.8.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 +15 -0
- package/README.en.md +7 -3
- package/README.md +7 -3
- package/docs/i18n.md +63 -0
- package/lib/adapters/files.d.ts +0 -7
- package/lib/adapters/files.js +4 -3
- package/lib/adapters/files.js.map +1 -1
- package/lib/adapters/git.d.ts +0 -10
- package/lib/adapters/git.js +6 -5
- package/lib/adapters/git.js.map +1 -1
- package/lib/adapters/registry.d.ts +0 -7
- package/lib/adapters/registry.js +2 -1
- package/lib/adapters/registry.js.map +1 -1
- package/lib/adapters/safe-file.d.ts +0 -7
- package/lib/adapters/safe-file.js +5 -4
- package/lib/adapters/safe-file.js.map +1 -1
- package/lib/client/WorktreeCreateRow.js +4 -2
- package/lib/client/WorktreeCreateRow.js.map +1 -1
- package/lib/client/WorktreeReviewRow.js +10 -8
- package/lib/client/WorktreeReviewRow.js.map +1 -1
- package/lib/client/actions.d.ts +3 -2
- package/lib/client/actions.js +17 -13
- package/lib/client/actions.js.map +1 -1
- package/lib/client/console-remote/adapter.d.ts +2 -1
- package/lib/client/console-remote/adapter.js +35 -32
- package/lib/client/console-remote/adapter.js.map +1 -1
- package/lib/client/console-remote/index.js +6 -2
- package/lib/client/console-remote/index.js.map +1 -1
- package/lib/client/i18n.d.ts +25 -0
- package/lib/client/i18n.js +43 -0
- package/lib/client/i18n.js.map +1 -0
- package/lib/client/index.d.ts +1 -1
- package/lib/client/index.js +17 -4
- package/lib/client/index.js.map +1 -1
- package/lib/client/model.d.ts +3 -2
- package/lib/client/model.js +8 -8
- package/lib/client/model.js.map +1 -1
- package/lib/client/pre-session/PreSessionWorktreeToggle.js +14 -12
- package/lib/client/pre-session/PreSessionWorktreeToggle.js.map +1 -1
- package/lib/client/pre-session/controller.js +11 -9
- package/lib/client/pre-session/controller.js.map +1 -1
- package/lib/client/pre-session/index.d.ts +12 -1
- package/lib/client/pre-session/index.js +9 -1
- package/lib/client/pre-session/index.js.map +1 -1
- package/lib/client/review-console/DeliveryProof.js +15 -12
- package/lib/client/review-console/DeliveryProof.js.map +1 -1
- package/lib/client/review-console/PreflightStatus.js +14 -8
- package/lib/client/review-console/PreflightStatus.js.map +1 -1
- package/lib/client/review-console/ReviewActions.js +97 -92
- package/lib/client/review-console/ReviewActions.js.map +1 -1
- package/lib/client/review-console/WorktreeReviewPanel.d.ts +1 -1
- package/lib/client/review-console/WorktreeReviewPanel.js +19 -16
- package/lib/client/review-console/WorktreeReviewPanel.js.map +1 -1
- package/lib/client/review-console/recovery-continuation.d.ts +2 -1
- package/lib/client/review-console/recovery-continuation.js +12 -8
- package/lib/client/review-console/recovery-continuation.js.map +1 -1
- package/lib/client/target-console/TargetStatusAction.js +28 -25
- package/lib/client/target-console/TargetStatusAction.js.map +1 -1
- package/lib/client/target-console/WorktreeConsoleView.js +40 -36
- package/lib/client/target-console/WorktreeConsoleView.js.map +1 -1
- package/lib/client/target-console/WorktreeManagerModal.js +3 -1
- package/lib/client/target-console/WorktreeManagerModal.js.map +1 -1
- package/lib/client/target-console/WorktreeReviewStatus.js +14 -12
- package/lib/client/target-console/WorktreeReviewStatus.js.map +1 -1
- package/lib/client/workspace-sidebar/index.js +4 -2
- package/lib/client/workspace-sidebar/index.js.map +1 -1
- package/lib/client/workspace-sidebar/model.d.ts +2 -1
- package/lib/client/workspace-sidebar/model.js +14 -13
- package/lib/client/workspace-sidebar/model.js.map +1 -1
- package/lib/client.js +2173 -477
- package/lib/commands.js +32 -35
- package/lib/commands.js.map +1 -1
- package/lib/console-host/control-plane.js +82 -81
- package/lib/console-host/control-plane.js.map +1 -1
- package/lib/console-host/errors.js +2 -1
- package/lib/console-host/errors.js.map +1 -1
- package/lib/console-host/projection.js +3 -1
- package/lib/console-host/projection.js.map +1 -1
- package/lib/console-host/review-diff.js +6 -5
- package/lib/console-host/review-diff.js.map +1 -1
- package/lib/console-host/service.d.ts +24 -22
- package/lib/console-host/service.js +54 -51
- package/lib/console-host/service.js.map +1 -1
- package/lib/console-remote/descriptors.js +2 -2
- package/lib/console-remote/descriptors.js.map +1 -1
- package/lib/console-remote/remote.d.ts +22 -21
- package/lib/console-remote/remote.js.map +1 -1
- package/lib/console-remote/schemas.d.ts +4 -0
- package/lib/console-remote/schemas.js +1 -0
- package/lib/console-remote/schemas.js.map +1 -1
- package/lib/i18n/client-messages.d.ts +1523 -0
- package/lib/i18n/client-messages.js +1431 -0
- package/lib/i18n/client-messages.js.map +1 -0
- package/lib/i18n/core.d.ts +12 -0
- package/lib/i18n/core.js +10 -0
- package/lib/i18n/core.js.map +1 -0
- package/lib/i18n/host-messages.d.ts +1463 -0
- package/lib/i18n/host-messages.js +1474 -0
- package/lib/i18n/host-messages.js.map +1 -0
- package/lib/i18n/host.d.ts +9 -0
- package/lib/i18n/host.js +34 -0
- package/lib/i18n/host.js.map +1 -0
- package/lib/i18n/transport-messages.d.ts +10 -0
- package/lib/i18n/transport-messages.js +11 -0
- package/lib/i18n/transport-messages.js.map +1 -0
- package/lib/session-checkout-apply.js +93 -92
- package/lib/session-checkout-apply.js.map +1 -1
- package/lib/session-checkout-module.js +232 -229
- package/lib/session-checkout-module.js.map +1 -1
- package/lib/session-target-context.js +2 -1
- package/lib/session-target-context.js.map +1 -1
- package/lib/tools.d.ts +0 -8
- package/lib/tools.js +108 -96
- package/lib/tools.js.map +1 -1
- package/package.json +2 -1
- package/scripts/dev-dsh-lib.mjs +1 -1
- package/scripts/workspace-sidebar-upstream.mjs +1 -1
package/lib/client/model.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
import { defaultClientTranslator } from './i18n.js';
|
|
2
2
|
function textContent(block) {
|
|
3
3
|
if (!block.kind)
|
|
4
4
|
return null;
|
|
@@ -32,14 +32,14 @@ function isRecord(value) {
|
|
|
32
32
|
function stringField(record, key) {
|
|
33
33
|
return typeof record[key] === 'string' && record[key] !== '' ? record[key] : null;
|
|
34
34
|
}
|
|
35
|
-
export function parseCreateTool(block) {
|
|
35
|
+
export function parseCreateTool(block, t = defaultClientTranslator) {
|
|
36
36
|
const state = lifecycle(block);
|
|
37
37
|
const raw = textContent(block);
|
|
38
38
|
const parsed = parseJson(raw ?? undefined);
|
|
39
39
|
if (state === 'running')
|
|
40
40
|
return { lifecycle: state, payload: null, args: null, error: null };
|
|
41
41
|
if (state !== 'ok')
|
|
42
|
-
return { lifecycle: state, payload: null, args: null, error: raw ??
|
|
42
|
+
return { lifecycle: state, payload: null, args: null, error: raw ?? t("worktree.creation.failed") };
|
|
43
43
|
if (!isRecord(parsed)
|
|
44
44
|
|| parsed.kind !== 'worktree_target_created'
|
|
45
45
|
|| !stringField(parsed, 'checkoutId')
|
|
@@ -48,7 +48,7 @@ export function parseCreateTool(block) {
|
|
|
48
48
|
|| !stringField(parsed, 'phase')
|
|
49
49
|
|| !stringField(parsed, 'currentOid')
|
|
50
50
|
|| !stringField(parsed, 'sourceSessionId')) {
|
|
51
|
-
return { lifecycle: 'error', payload: null, args: null, error:
|
|
51
|
+
return { lifecycle: 'error', payload: null, args: null, error: t("malformed.worktree.create.result") };
|
|
52
52
|
}
|
|
53
53
|
return { lifecycle: state, payload: parsed, args: null, error: null };
|
|
54
54
|
}
|
|
@@ -88,7 +88,7 @@ function reviewArgs(value) {
|
|
|
88
88
|
...(typeof value.validationSummary === 'string' && value.validationSummary !== '' ? { validationSummary: value.validationSummary } : {}),
|
|
89
89
|
};
|
|
90
90
|
}
|
|
91
|
-
export function parseReviewTool(block) {
|
|
91
|
+
export function parseReviewTool(block, t = defaultClientTranslator) {
|
|
92
92
|
const state = lifecycle(block);
|
|
93
93
|
const raw = textContent(block);
|
|
94
94
|
const parsed = parseJson(raw ?? undefined);
|
|
@@ -97,7 +97,7 @@ export function parseReviewTool(block) {
|
|
|
97
97
|
if (state === 'running')
|
|
98
98
|
return { lifecycle: state, payload: null, args: parsedArgs, error: null };
|
|
99
99
|
if (state !== 'ok')
|
|
100
|
-
return { lifecycle: state, payload: null, args: parsedArgs, error: raw ??
|
|
100
|
+
return { lifecycle: state, payload: null, args: parsedArgs, error: raw ?? t("ready.for.review.failed") };
|
|
101
101
|
if (!isRecord(parsed)
|
|
102
102
|
|| parsed.kind !== 'worktree_ready_for_review'
|
|
103
103
|
|| parsed.state !== 'ready_for_review'
|
|
@@ -105,10 +105,10 @@ export function parseReviewTool(block) {
|
|
|
105
105
|
|| typeof parsed.revision !== 'number'
|
|
106
106
|
|| !Array.isArray(parsed.changedFiles)
|
|
107
107
|
|| parsed.changedFiles.some((item) => typeof item !== 'string')) {
|
|
108
|
-
return { lifecycle: 'error', payload: null, args: null, error:
|
|
108
|
+
return { lifecycle: 'error', payload: null, args: null, error: t("malformed.ready.for.review.result") };
|
|
109
109
|
}
|
|
110
110
|
if (!parsedArgs) {
|
|
111
|
-
return { lifecycle: 'error', payload: null, args: null, error:
|
|
111
|
+
return { lifecycle: 'error', payload: null, args: null, error: t("malformed.ready.for.review.arguments") };
|
|
112
112
|
}
|
|
113
113
|
return {
|
|
114
114
|
lifecycle: state,
|
package/lib/client/model.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/client/model.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/client/model.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
2
|
+
import { useClientTranslator, defaultClientTranslator } from '../i18n.js';
|
|
2
3
|
import { useCallback, useEffect, useRef, useState } from 'react';
|
|
3
4
|
import { Modal } from '@deepseek-ai/dsh-client-ui-primitives';
|
|
4
5
|
function errorMessage(value) {
|
|
@@ -11,21 +12,22 @@ function snapshotInput(input) {
|
|
|
11
12
|
occurrences: [...input.occurrences],
|
|
12
13
|
};
|
|
13
14
|
}
|
|
14
|
-
function confirmationDescription(input) {
|
|
15
|
+
function confirmationDescription(input, t = defaultClientTranslator) {
|
|
15
16
|
const attachmentText = input.imageIds.length === 1
|
|
16
|
-
?
|
|
17
|
-
:
|
|
17
|
+
? t("1.attachment")
|
|
18
|
+
: t("attachments", { p0: input.imageIds.length });
|
|
18
19
|
if (input.draft.trim() !== '' && input.imageIds.length > 0) {
|
|
19
|
-
return
|
|
20
|
+
return t("the.current.input.and.will.move.to.the", { p0: attachmentText });
|
|
20
21
|
}
|
|
21
22
|
if (input.imageIds.length > 0)
|
|
22
|
-
return
|
|
23
|
+
return t("will.move.to.the.new.worktree.session", { p0: attachmentText });
|
|
23
24
|
if (input.draft.trim() !== '')
|
|
24
|
-
return
|
|
25
|
-
return
|
|
25
|
+
return t("the.current.input.will.move.to.the.new");
|
|
26
|
+
return t("a.new.worktree.session.will.be.created.the");
|
|
26
27
|
}
|
|
27
28
|
/** Blank-session Worktree switch mounted in Harness's public composer tool row. */
|
|
28
29
|
export function PreSessionWorktreeToggle({ sessionId, session, input, inputActions, adapter, controller, }) {
|
|
30
|
+
const t = useClientTranslator();
|
|
29
31
|
const [target, setTarget] = useState(null);
|
|
30
32
|
const [state, setState] = useState('loading');
|
|
31
33
|
const [error, setError] = useState(null);
|
|
@@ -92,13 +94,13 @@ export function PreSessionWorktreeToggle({ sessionId, session, input, inputActio
|
|
|
92
94
|
const disabled = busy || selected || (!canCreate && !retryingLookup) || input.phase !== 'plain';
|
|
93
95
|
const checked = selected || pendingInput !== null || state === 'preparing';
|
|
94
96
|
const status = state === 'preparing'
|
|
95
|
-
?
|
|
97
|
+
? t("creating")
|
|
96
98
|
: selected
|
|
97
|
-
?
|
|
99
|
+
? t("created")
|
|
98
100
|
: pendingInput !== null
|
|
99
|
-
?
|
|
101
|
+
? t("awaiting.confirmation")
|
|
100
102
|
: state === 'error'
|
|
101
|
-
?
|
|
103
|
+
? t("retry")
|
|
102
104
|
: 'Local';
|
|
103
105
|
const beginConfirmation = async () => {
|
|
104
106
|
if (disabled)
|
|
@@ -139,6 +141,6 @@ export function PreSessionWorktreeToggle({ sessionId, session, input, inputActio
|
|
|
139
141
|
setError(errorMessage(cause));
|
|
140
142
|
}
|
|
141
143
|
};
|
|
142
|
-
return (_jsxs("span", { className: "dsh-wt-pre-session", "data-state": state, children: [_jsxs("button", { type: "button", role: "switch", "aria-label": "Worktree", "aria-checked": checked, "aria-describedby": error && pendingInput === null ? `dsh-wt-pre-session-error-${sessionId}` : undefined, className: "dsh-wt-pre-session-switch", disabled: disabled, onClick: () => { void beginConfirmation(); }, children: [_jsx("span", { className: "dsh-wt-pre-session-check", "aria-hidden": true, children: checked ? '✓' : '' }), _jsx("span", { children: "
|
|
144
|
+
return (_jsxs("span", { className: "dsh-wt-pre-session", "data-state": state, children: [_jsxs("button", { type: "button", role: "switch", "aria-label": "Worktree", "aria-checked": checked, "aria-describedby": error && pendingInput === null ? `dsh-wt-pre-session-error-${sessionId}` : undefined, className: "dsh-wt-pre-session-switch", disabled: disabled, onClick: () => { void beginConfirmation(); }, children: [_jsx("span", { className: "dsh-wt-pre-session-check", "aria-hidden": true, children: checked ? '✓' : '' }), _jsx("span", { children: t("worktree") }), _jsx("span", { className: "dsh-wt-pre-session-state", "aria-live": "polite", children: status })] }), error && pendingInput === null ? (_jsx("span", { id: `dsh-wt-pre-session-error-${sessionId}`, className: "dsh-wt-pre-session-error", role: "alert", children: error })) : null, _jsxs(Modal, { open: pendingInput !== null, onClose: cancelConfirmation, title: t("start.in.a.worktree"), closeLabel: t("close"), description: pendingInput === null ? '' : confirmationDescription(pendingInput, t), footer: (_jsxs(_Fragment, { children: [_jsxs("button", { type: "button", className: "dsh-wt-button", disabled: state === 'preparing', onClick: cancelConfirmation, children: [t("cancel"), " "] }), _jsx("button", { type: "button", className: "dsh-wt-button dsh-wt-primary", disabled: state === 'preparing', onClick: () => { void confirm(); }, children: state === 'preparing' ? t("creating") : t("create.and.switch") })] })), children: [_jsx("p", { className: "dsh-wt-pre-session-note", children: t("the.local.session.will.not.receive.this.message") }), error ? _jsx("p", { className: "dsh-wt-error", role: "alert", children: error }) : null] })] }));
|
|
143
145
|
}
|
|
144
146
|
//# 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,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAChE,OAAO,EAAE,KAAK,EAAE,MAAM,uCAAuC,CAAA;AAsB7D,SAAS,YAAY,CAAC,KAAc;IAClC,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;AAC/D,CAAC;AAED,SAAS,aAAa,CAAC,KAA2B;IAChD,OAAO;QACL,GAAG,KAAK;QACR,QAAQ,EAAE,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC;QAC7B,WAAW,EAAE,CAAC,GAAG,KAAK,CAAC,WAAW,CAAC;KACpC,CAAA;AACH,CAAC;AAED,SAAS,uBAAuB,CAAC,KAA2B;
|
|
1
|
+
{"version":3,"file":"PreSessionWorktreeToggle.js","sourceRoot":"","sources":["../../../src/client/pre-session/PreSessionWorktreeToggle.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { translatorForServices } from '../i18n.js';
|
|
1
2
|
export class PreSessionWorktreeError extends Error {
|
|
2
3
|
recoveryRequired;
|
|
3
4
|
constructor(message, recoveryRequired = false) {
|
|
@@ -45,14 +46,15 @@ export class PreSessionWorktreeController {
|
|
|
45
46
|
return attempt;
|
|
46
47
|
}
|
|
47
48
|
async run(request) {
|
|
49
|
+
const t = translatorForServices(this.services);
|
|
48
50
|
if (request.input.phase !== 'plain') {
|
|
49
|
-
throw new PreSessionWorktreeError(
|
|
51
|
+
throw new PreSessionWorktreeError(t("the.draft.is.being.submitted.or.parsed.wait"));
|
|
50
52
|
}
|
|
51
53
|
if (request.input.occurrences.length > 0) {
|
|
52
|
-
throw new PreSessionWorktreeError(
|
|
54
|
+
throw new PreSessionWorktreeError(t("the.draft.contains.unserialized.references.remove.the.reference"));
|
|
53
55
|
}
|
|
54
56
|
const previousBlock = this.services.conversation.blocks.storeFor(request.sessionId).getSnapshot();
|
|
55
|
-
this.services.conversation.blocks.set(request.sessionId, { reason:
|
|
57
|
+
this.services.conversation.blocks.set(request.sessionId, { reason: t("creating.isolated.worktree") });
|
|
56
58
|
let created;
|
|
57
59
|
let workspaceId;
|
|
58
60
|
let actualSessionId;
|
|
@@ -63,7 +65,7 @@ export class PreSessionWorktreeController {
|
|
|
63
65
|
created = outcome.value;
|
|
64
66
|
const workspace = await this.services.workspaces.create({ path: created.managedRoot });
|
|
65
67
|
if (workspace.path !== created.managedRoot) {
|
|
66
|
-
throw new PreSessionWorktreeError(
|
|
68
|
+
throw new PreSessionWorktreeError(t("harness.registered.the.managed.root.at.a.different", { p0: workspace.path }));
|
|
67
69
|
}
|
|
68
70
|
workspaceId = workspace.workspaceId;
|
|
69
71
|
actualSessionId = await this.services.sessions.create({
|
|
@@ -71,15 +73,15 @@ export class PreSessionWorktreeController {
|
|
|
71
73
|
sessionId: created.targetSessionId,
|
|
72
74
|
});
|
|
73
75
|
if (actualSessionId !== created.targetSessionId) {
|
|
74
|
-
throw new PreSessionWorktreeError(
|
|
76
|
+
throw new PreSessionWorktreeError(t("harness.created.unexpected.session.expected.2", { p0: actualSessionId, p1: created.targetSessionId }));
|
|
75
77
|
}
|
|
76
78
|
const targetBinding = this.services.sessions.binding(created.targetSessionId);
|
|
77
79
|
if (targetBinding?.ctx === undefined) {
|
|
78
|
-
throw new PreSessionWorktreeError(
|
|
80
|
+
throw new PreSessionWorktreeError(t("the.target.session.was.created.but.harness.has"));
|
|
79
81
|
}
|
|
80
82
|
const targetInput = this.services.conversation.input.for(targetBinding.ctx);
|
|
81
83
|
if (!sourceStillMatches(request)) {
|
|
82
|
-
throw new PreSessionWorktreeError(
|
|
84
|
+
throw new PreSessionWorktreeError(t("the.local.draft.or.attachments.changed.after.confirmation"));
|
|
83
85
|
}
|
|
84
86
|
// From the final source CAS through target writes, navigation and source
|
|
85
87
|
// clear there is no await. This ordering matters for image IDs: a failed
|
|
@@ -87,7 +89,7 @@ export class PreSessionWorktreeController {
|
|
|
87
89
|
// that the preserved source still references.
|
|
88
90
|
targetInput.setDraft(request.input.draft);
|
|
89
91
|
if (!targetInput.addImages(request.input.imageIds)) {
|
|
90
|
-
throw new PreSessionWorktreeError(
|
|
92
|
+
throw new PreSessionWorktreeError(t("the.target.session.is.temporarily.refusing.draft.attachments"));
|
|
91
93
|
}
|
|
92
94
|
this.services.sessions.open(created.targetSessionId);
|
|
93
95
|
request.inputActions.setDraft('');
|
|
@@ -108,7 +110,7 @@ export class PreSessionWorktreeController {
|
|
|
108
110
|
if (created !== undefined) {
|
|
109
111
|
const cleaned = await this.rollback(request.sessionId, created.targetSessionId, created.target, workspaceId, actualSessionId);
|
|
110
112
|
if (!cleaned) {
|
|
111
|
-
throw new PreSessionWorktreeError(
|
|
113
|
+
throw new PreSessionWorktreeError(t("the.worktree.was.persisted.but.automatic.rollback.failed", { p0: messageOf(error) }), true);
|
|
112
114
|
}
|
|
113
115
|
}
|
|
114
116
|
throw error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../src/client/pre-session/controller.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../src/client/pre-session/controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAA;AAgClD,MAAM,OAAO,uBAAwB,SAAQ,KAAK;IACV;IAAtC,YAAY,OAAe,EAAW,mBAAmB,KAAK;QAC5D,KAAK,CAAC,OAAO,CAAC,CAAA;QADsB,qBAAgB,GAAhB,gBAAgB,CAAQ;QAE5D,IAAI,CAAC,IAAI,GAAG,yBAAyB,CAAA;IACvC,CAAC;CACF;AAED,SAAS,SAAS,CAAC,KAAc;IAC/B,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;AAC/D,CAAC;AAED,SAAS,WAAW,CAAC,IAAuB,EAAE,KAAwB;IACpE,OAAO,IAAI,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;AAC7F,CAAC;AAED,SAAS,kBAAkB,CAAC,OAAyC;IACnE,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,EAAE,IAAI,OAAO,CAAC,KAAK,CAAA;IACzD,OAAO,OAAO,CAAC,KAAK,KAAK,OAAO;WAC3B,OAAO,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK,CAAC,KAAK;WACrC,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC;WACrD,OAAO,CAAC,WAAW,CAAC,MAAM,KAAK,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM;WAC/D,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,KAAK,SAAS,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;AAC5F,CAAC;AAED;;;;GAIG;AACH,MAAM,OAAO,4BAA4B;IAIpB;IACA;IAJF,QAAQ,GAAG,IAAI,GAAG,EAAiD,CAAA;IAEpF,YACmB,OAA+B,EAC/B,QAAoC;QADpC,YAAO,GAAP,OAAO,CAAwB;QAC/B,aAAQ,GAAR,QAAQ,CAA4B;IACpD,CAAC;IAEJ,OAAO,CAAC,OAAyC;QAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QACrD,IAAI,QAAQ,KAAK,SAAS;YAAE,OAAO,QAAQ,CAAA;QAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;YAC7C,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,OAAO;gBAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QAC/F,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;QAC7C,OAAO,OAAO,CAAA;IAChB,CAAC;IAEO,KAAK,CAAC,GAAG,CAAC,OAAyC;QACzD,MAAM,CAAC,GAAG,qBAAqB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAE9C,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;YACpC,MAAM,IAAI,uBAAuB,CAAC,CAAC,CAAC,6CAA6C,CAAC,CAAC,CAAA;QACrF,CAAC;QACD,IAAI,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,uBAAuB,CAAC,CAAC,CAAC,iEAAiE,CAAC,CAAC,CAAA;QACzG,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,CAAA;QACjG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,4BAA4B,CAAC,EAAE,CAAC,CAAA;QAErG,IAAI,OAAkD,CAAA;QACtD,IAAI,WAA+B,CAAA;QACnC,IAAI,eAAmC,CAAA;QACvC,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,eAAe,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;YACjF,IAAI,CAAC,OAAO,CAAC,EAAE;gBAAE,MAAM,IAAI,uBAAuB,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;YACrG,OAAO,GAAG,OAAO,CAAC,KAAK,CAAA;YAEvB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,CAAA;YACtF,IAAI,SAAS,CAAC,IAAI,KAAK,OAAO,CAAC,WAAW,EAAE,CAAC;gBAC3C,MAAM,IAAI,uBAAuB,CAAC,CAAC,CAAC,oDAAoD,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;YACpH,CAAC;YACD,WAAW,GAAG,SAAS,CAAC,WAAW,CAAA;YAEnC,eAAe,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC;gBACpD,WAAW,EAAE,SAAS,CAAC,WAAW;gBAClC,SAAS,EAAE,OAAO,CAAC,eAAe;aACnC,CAAC,CAAA;YACF,IAAI,eAAe,KAAK,OAAO,CAAC,eAAe,EAAE,CAAC;gBAChD,MAAM,IAAI,uBAAuB,CAC/B,CAAC,CAAC,+CAA+C,EAAE,EAAE,EAAE,EAAE,eAAe,EAAE,EAAE,EAAE,OAAO,CAAC,eAAe,EAAE,CAAC,CACzG,CAAA;YACH,CAAC;YAED,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;YAC7E,IAAI,aAAa,EAAE,GAAG,KAAK,SAAS,EAAE,CAAC;gBACrC,MAAM,IAAI,uBAAuB,CAAC,CAAC,CAAC,gDAAgD,CAAC,CAAC,CAAA;YACxF,CAAC;YACD,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,CAAA;YAC3E,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,CAAC;gBACjC,MAAM,IAAI,uBAAuB,CAAC,CAAC,CAAC,2DAA2D,CAAC,CAAC,CAAA;YACnG,CAAC;YACD,yEAAyE;YACzE,yEAAyE;YACzE,yEAAyE;YACzE,8CAA8C;YAC9C,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YACzC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACnD,MAAM,IAAI,uBAAuB,CAAC,CAAC,CAAC,8DAA8D,CAAC,CAAC,CAAA;YACtG,CAAC;YACD,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;YACpD,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;YACjC,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,KAAK,CAAC,QAAQ;gBAAE,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;YACvF,0EAA0E;YAC1E,uEAAuE;YACvE,0EAA0E;YAC1E,yEAAyE;YACzE,uCAAuC;YACvC,IAAI,CAAC;gBAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,0CAA0C,CAAC,CAAC;YAC7H,OAAO,OAAO,CAAC,MAAM,CAAA;QACvB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;gBAC1B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CACjC,OAAO,CAAC,SAAS,EACjB,OAAO,CAAC,eAAe,EACvB,OAAO,CAAC,MAAM,EACd,WAAW,EACX,eAAe,CAChB,CAAA;gBACD,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,MAAM,IAAI,uBAAuB,CAC/B,CAAC,CAAC,0DAA0D,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,EACvF,IAAI,CACL,CAAA;gBACH,CAAC;YACH,CAAC;YACD,MAAM,KAAK,CAAA;QACb,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;QACzE,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,QAAQ,CACpB,eAAuB,EACvB,eAAuB,EACvB,MAAoC,EACpC,WAA+B,EAC/B,eAAmC;QAEnC,IAAI,MAAM,CAAC,UAAU,KAAK,IAAI;YAAE,OAAO,KAAK,CAAA;QAC5C,IAAI,SAAS,GAAG,KAAK,CAAA;QACrB,KAAK,MAAM,MAAM,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC,EAAE,CAAC;YACxD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;gBACxC,SAAS,EAAE,MAAM;gBACjB,UAAU,EAAE,MAAM,CAAC,UAAU;gBAC7B,gBAAgB,EAAE,MAAM,CAAC,QAAQ;gBACjC,YAAY,EAAE,KAAK;aACpB,CAAC,CAAA;YACF,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;gBACd,SAAS,GAAG,IAAI,CAAA;gBAChB,MAAK;YACP,CAAC;QACH,CAAC;QACD,IAAI,CAAC,SAAS;YAAE,OAAO,KAAK,CAAA;QAE5B,MAAM,gBAAgB,GAAG,eAAe,IAAI,eAAe,CAAA;QAC3D,2EAA2E;QAC3E,uEAAuE;QACvE,uDAAuD;QACvD,IAAI,CAAC;YAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAA;QAAC,CAAC;QAAC,MAAM,CAAC,CAAC,mCAAmC,CAAC,CAAC;QACrH,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC9B,IAAI,CAAC;gBAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,sDAAsD,CAAC,CAAC;QAC7H,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;CACF;AAED,MAAM,UAAU,kCAAkC,CAChD,OAA+B,EAC/B,QAAoC;IAEpC,OAAO,IAAI,4BAA4B,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;AAC5D,CAAC"}
|
|
@@ -1,8 +1,19 @@
|
|
|
1
1
|
import type { ComponentType } from 'react';
|
|
2
|
+
import type { SessionSnapshot } from '@deepseek-ai/dsh-api-session-controller/client';
|
|
3
|
+
import type { SnapshotSelectorHook } from '@deepseek-ai/dsh-client-store';
|
|
2
4
|
import type { WorktreeConsoleAdapter } from '../../console-contract.js';
|
|
3
5
|
import type { PreSessionWorktreeServices } from '../actions.js';
|
|
4
6
|
import { type PreSessionWorktreeToggleProps } from './PreSessionWorktreeToggle.js';
|
|
5
|
-
|
|
7
|
+
/** rc.1 input.left has no owner snapshot props; snapshots come from standard hooks. */
|
|
8
|
+
export interface PreSessionSlotProps {
|
|
9
|
+
sessionId: string;
|
|
10
|
+
useSession: SnapshotSelectorHook<SessionSnapshot>;
|
|
11
|
+
useConversation: SnapshotSelectorHook<{
|
|
12
|
+
readonly activeTargets: ReadonlySet<string>;
|
|
13
|
+
}>;
|
|
14
|
+
useInput: SnapshotSelectorHook<PreSessionWorktreeToggleProps['input']>;
|
|
15
|
+
inputActions: PreSessionWorktreeToggleProps['inputActions'];
|
|
16
|
+
}
|
|
6
17
|
export interface PreSessionSlotContextLike {
|
|
7
18
|
slots: {
|
|
8
19
|
inject(name: 'conversation.input.left', callback: () => unknown): void;
|
|
@@ -4,7 +4,15 @@ import { PreSessionWorktreeToggle, } from './PreSessionWorktreeToggle.js';
|
|
|
4
4
|
/** Register the blank-session switch in Harness's public composer tool row. */
|
|
5
5
|
export function registerPreSessionWorktree(ctx, adapter, services) {
|
|
6
6
|
const controller = createPreSessionWorktreeController(adapter, services);
|
|
7
|
-
const Entry = (
|
|
7
|
+
const Entry = ({ sessionId, useSession, useConversation, useInput, inputActions }) => {
|
|
8
|
+
// Match Harness's conversationPhase: a pending first turn is not a blank
|
|
9
|
+
// launcher, and any active Conversation target makes this an existing session.
|
|
10
|
+
const sessionPhase = useSession(session => (!session.blank && !session.awaitingFirstTurn) || session.running
|
|
11
|
+
? 'active' : session.promptAttempted ? 'engaging' : 'blank');
|
|
12
|
+
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 });
|
|
15
|
+
};
|
|
8
16
|
ctx.slots.inject('conversation.input.left', () => ctx.slots.register({
|
|
9
17
|
name: 'conversation.input.left',
|
|
10
18
|
id: 'worktree-pre-session',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/client/pre-session/index.tsx"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/client/pre-session/index.tsx"],"names":[],"mappings":";AAKA,OAAO,EAAE,kCAAkC,EAAE,MAAM,iBAAiB,CAAA;AACpE,OAAO,EACL,wBAAwB,GAEzB,MAAM,+BAA+B,CAAA;AAqBtC,+EAA+E;AAC/E,MAAM,UAAU,0BAA0B,CACxC,GAA8B,EAC9B,OAA+B,EAC/B,QAAoC;IAEpC,MAAM,UAAU,GAAG,kCAAkC,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IACxE,MAAM,KAAK,GAAG,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,eAAe,EAAE,QAAQ,EAAE,YAAY,EAAuB,EAAE,EAAE;QACxG,yEAAyE;QACzE,+EAA+E;QAC/E,MAAM,YAAY,GAAG,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,OAAO,CAAC,OAAO;YAC1G,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;QAC9D,MAAM,eAAe,GAAG,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,CAAC,CAAA;QAC5F,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAA;QAC5C,OAAO,KAAC,wBAAwB,IAC9B,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,EAAE,EACrE,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,UAAU,GACtB,CAAA;IACJ,CAAC,CAAA;IACD,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,yBAAyB,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAClE;QACE,IAAI,EAAE,yBAAyB;QAC/B,EAAE,EAAE,sBAAsB;QAC1B,KAAK,EAAE,EAAE;KACV,EACD,KAAK,CACN,CAAC,CAAA;AACJ,CAAC;AAED,OAAO,EAAE,4BAA4B,EAAE,uBAAuB,EAAE,kCAAkC,EAAE,MAAM,iBAAiB,CAAA;AAC3H,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAA"}
|
|
@@ -1,32 +1,35 @@
|
|
|
1
1
|
import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
+
import { useClientLanguage, useClientTranslator, defaultClientTranslator } from '../i18n.js';
|
|
2
3
|
function shortOid(value) {
|
|
3
4
|
return value.slice(0, 8);
|
|
4
5
|
}
|
|
5
|
-
function validationLabel(status) {
|
|
6
|
+
function validationLabel(status, t = defaultClientTranslator) {
|
|
6
7
|
if (status === 'passed')
|
|
7
|
-
return
|
|
8
|
+
return t("validation.passed");
|
|
8
9
|
if (status === 'failed')
|
|
9
|
-
return
|
|
10
|
+
return t("validation.failed");
|
|
10
11
|
if (status === 'partial')
|
|
11
|
-
return
|
|
12
|
+
return t("partial.validation");
|
|
12
13
|
if (status === 'not_run')
|
|
13
|
-
return
|
|
14
|
-
return
|
|
14
|
+
return t("validation.not.run");
|
|
15
|
+
return t("no.validation.summary");
|
|
15
16
|
}
|
|
16
17
|
export function DeliveryProof({ target, compact = false }) {
|
|
18
|
+
const t = useClientTranslator();
|
|
19
|
+
const language = useClientLanguage();
|
|
17
20
|
const proof = target.deliveryProof;
|
|
18
21
|
if (!proof)
|
|
19
22
|
return null;
|
|
20
23
|
const lifecycle = target.state === 'delivered'
|
|
21
|
-
?
|
|
24
|
+
? t("environment.cleaned.up")
|
|
22
25
|
: target.state === 'retained'
|
|
23
|
-
?
|
|
26
|
+
? t("environment.retained", { p0: target.expiresAt ? t("until", { p0: new Date(target.expiresAt).toLocaleString(language === 'en' ? 'en-US' : 'zh-CN') }) : '' })
|
|
24
27
|
: target.state === 'cleanup_pending'
|
|
25
|
-
?
|
|
26
|
-
:
|
|
28
|
+
? t("commit.created.environment.cleanup.pending")
|
|
29
|
+
: t("delivery.evidence.recorded");
|
|
27
30
|
if (compact) {
|
|
28
|
-
return (_jsxs("span", { className: "dsh-wt-delivery-proof dsh-wt-delivery-proof-compact", children: ["
|
|
31
|
+
return (_jsxs("span", { className: "dsh-wt-delivery-proof dsh-wt-delivery-proof-compact", children: [t("commit"), " ", target.commitOid ? shortOid(target.commitOid) : t("no.new.commit"), " \u00B7 ", proof.localBranch ?? t("detached.head"), "@", shortOid(proof.localHeadAfter), " \u00B7 ", t("count.files", { count: proof.changedFiles.length }), " \u00B7 ", lifecycle] }));
|
|
29
32
|
}
|
|
30
|
-
return (_jsxs("section", { className: "dsh-wt-delivery-proof", "aria-label": "
|
|
33
|
+
return (_jsxs("section", { className: "dsh-wt-delivery-proof", "aria-label": t("delivery.proof"), children: [_jsxs("header", { children: [_jsx("strong", { children: t("delivery.proof.2") }), _jsx("span", { children: lifecycle })] }), _jsxs("dl", { children: [_jsxs("div", { children: [_jsx("dt", { children: t("commit") }), _jsx("dd", { children: _jsx("code", { children: target.commitOid ?? t("no.new.commit") }) })] }), _jsxs("div", { children: [_jsx("dt", { children: t("local") }), _jsxs("dd", { children: [proof.localBranch ?? t("detached.head"), " \u00B7 ", _jsx("code", { children: shortOid(proof.localHeadBefore) }), " \u2192 ", _jsx("code", { children: shortOid(proof.localHeadAfter) })] })] }), _jsxs("div", { children: [_jsx("dt", { children: t("files.2") }), _jsx("dd", { children: t("count.files", { count: proof.changedFiles.length }) })] }), _jsxs("div", { children: [_jsx("dt", { children: t("validation") }), _jsxs("dd", { children: [validationLabel(proof.validationStatus, t), proof.validationSummary ? ` · ${proof.validationSummary}` : ''] })] }), _jsxs("div", { children: [_jsx("dt", { children: t("local.history") }), _jsx("dd", { children: proof.commitInLocalHistory === true ? t("commit.is.still.in.local.history") : proof.commitInLocalHistory === false ? t("commit.is.no.longer.in.current.local.history") : t("cannot.confirm.at.this.time") })] })] })] }));
|
|
31
34
|
}
|
|
32
35
|
//# sourceMappingURL=DeliveryProof.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryProof.js","sourceRoot":"","sources":["../../../src/client/review-console/DeliveryProof.tsx"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"DeliveryProof.js","sourceRoot":"","sources":["../../../src/client/review-console/DeliveryProof.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,24 +1,26 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
+
import { useClientTranslator, defaultClientTranslator } from '../i18n.js';
|
|
2
3
|
function shortOid(value) {
|
|
3
4
|
return value.slice(0, 8);
|
|
4
5
|
}
|
|
5
|
-
function statusLabel(preflight) {
|
|
6
|
+
function statusLabel(preflight, t = defaultClientTranslator) {
|
|
6
7
|
switch (preflight.status) {
|
|
7
|
-
case 'ready': return
|
|
8
|
-
case 'local_advanced': return
|
|
9
|
-
case 'already_in_local': return
|
|
10
|
-
case 'conflict': return
|
|
8
|
+
case 'ready': return t("sync.conditions.confirmed");
|
|
9
|
+
case 'local_advanced': return t("local.advanced.safe.to.merge");
|
|
10
|
+
case 'already_in_local': return t("this.iteration.is.already.in.local");
|
|
11
|
+
case 'conflict': return t("found.conflicting.files", { p0: preflight.conflictingFiles.length });
|
|
11
12
|
case 'blocked': return preflight.message;
|
|
12
13
|
}
|
|
13
14
|
}
|
|
14
15
|
export function PreflightStatus({ snapshot, target, compact = false, onRefresh, onRecovery, onOpenHolder, busy, }) {
|
|
16
|
+
const t = useClientTranslator();
|
|
15
17
|
if (snapshot.status === 'idle')
|
|
16
18
|
return null;
|
|
17
19
|
if (snapshot.status === 'loading') {
|
|
18
|
-
return _jsx("div", { className: "dsh-wt-preflight", "data-preflight": "loading", children: "
|
|
20
|
+
return _jsx("div", { className: "dsh-wt-preflight", "data-preflight": "loading", children: t("running.read.only.sync.preflight.local.will.not") });
|
|
19
21
|
}
|
|
20
22
|
if (snapshot.status === 'error') {
|
|
21
|
-
return (_jsxs("div", { className: "dsh-wt-preflight", "data-preflight": "error", children: [_jsxs("span", { children: ["
|
|
23
|
+
return (_jsxs("div", { className: "dsh-wt-preflight", "data-preflight": "error", children: [_jsxs("span", { children: [t("preflight.failed"), snapshot.error.message] }), _jsx("button", { type: "button", className: "dsh-wt-inline-action", disabled: busy, onClick: onRefresh, children: t("check.again") })] }));
|
|
22
24
|
}
|
|
23
25
|
const preflight = snapshot.preflight;
|
|
24
26
|
const blocked = preflight.status === 'blocked';
|
|
@@ -26,6 +28,10 @@ export function PreflightStatus({ snapshot, target, compact = false, onRefresh,
|
|
|
26
28
|
const holder = blocked && preflight.reason === 'project_acceptance_busy'
|
|
27
29
|
? preflight.blocker ?? target?.reviewSlotHolder
|
|
28
30
|
: undefined;
|
|
29
|
-
return (_jsxs("div", { className: "dsh-wt-preflight", "data-preflight": preflight.status, children: [_jsxs("div", { className: "dsh-wt-preflight-head", children: [_jsx("strong", { children: statusLabel(preflight) }), _jsx("span", { children: "
|
|
31
|
+
return (_jsxs("div", { className: "dsh-wt-preflight", "data-preflight": preflight.status, children: [_jsxs("div", { className: "dsh-wt-preflight-head", children: [_jsx("strong", { children: statusLabel(preflight, t) }), _jsx("span", { children: t("read.only.check.local.unchanged") })] }), !compact && preflight.status !== 'blocked' ? (_jsxs("dl", { className: "dsh-wt-preflight-facts", children: [_jsxs("div", { children: [_jsx("dt", { children: t("local") }), _jsxs("dd", { children: [preflight.localBranch ?? 'detached', " \u00B7 ", _jsx("code", { children: shortOid(preflight.localHeadOid) })] })] }), _jsxs("div", { children: [_jsx("dt", { children: t("worktree") }), _jsx("dd", { children: _jsx("code", { children: shortOid(preflight.isolatedHeadOid) }) })] }), _jsxs("div", { children: [_jsx("dt", { children: t("effective.base") }), _jsx("dd", { children: _jsx("code", { children: shortOid(preflight.effectiveBaseOid) }) })] }), _jsxs("div", { children: [_jsx("dt", { children: t("changes") }), _jsx("dd", { children: t("count.files", { count: preflight.changedFiles.length }) })] })] })) : null, !compact && preflight.status === 'conflict' && preflight.conflictingFiles.length > 0 ? (_jsx("ul", { className: "dsh-wt-conflict-list", "aria-label": t("conflicting.files"), children: preflight.conflictingFiles.map(path => _jsx("li", { children: _jsx("code", { children: path }) }, path)) })) : null, holder ? _jsxs("p", { children: [t("holding.task"), holder.checkoutId.slice(0, 8), " ", t("session"), " ", holder.ownerSessionId.slice(0, 8), " \u00B7 ", {
|
|
32
|
+
preview_active: t('previewing'), preview_detached: t('awaiting.recovery'),
|
|
33
|
+
finalized: t('completed'), retained: t('retained'), working: t('in.progress'),
|
|
34
|
+
ready_for_review: t('ready.for.review'), delivered: t('delivered'),
|
|
35
|
+
}[holder.state]] }) : null, preflight.status === 'conflict' || blocked ? (_jsxs("div", { className: "dsh-wt-recovery-actions", children: [_jsx("button", { type: "button", className: "dsh-wt-inline-action", disabled: busy, onClick: onRefresh, children: t("check.again") }), preflight.status === 'conflict' ? (_jsxs("button", { type: "button", className: "dsh-wt-inline-action", disabled: busy || !target?.capabilities.resumeRevision, onClick: () => onRecovery(preflight), children: [t("ask.agent.to.resolve.conflicts"), " "] })) : staleIsolated ? (_jsxs("button", { type: "button", className: "dsh-wt-inline-action", disabled: busy, onClick: () => onRecovery(preflight), children: [t("regenerate.review"), " "] })) : null, holder ? (_jsx("button", { type: "button", className: "dsh-wt-inline-action", disabled: busy, onClick: onOpenHolder, children: t("open.holding.task") })) : null] })) : null] }));
|
|
30
36
|
}
|
|
31
37
|
//# sourceMappingURL=PreflightStatus.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PreflightStatus.js","sourceRoot":"","sources":["../../../src/client/review-console/PreflightStatus.tsx"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"PreflightStatus.js","sourceRoot":"","sources":["../../../src/client/review-console/PreflightStatus.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,uBAAuB,EAAyB,MAAM,YAAY,CAAA;AAKhG,SAAS,QAAQ,CAAC,KAAa;IAC7B,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;AAC1B,CAAC;AAED,SAAS,WAAW,CAAC,SAAqC,EAAE,IAAsB,uBAAuB;IACvG,QAAQ,SAAS,CAAC,MAAM,EAAE,CAAC;QACzB,KAAK,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,2BAA2B,CAAC,CAAA;QACnD,KAAK,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,8BAA8B,CAAC,CAAA;QAC/D,KAAK,kBAAkB,CAAC,CAAC,OAAO,CAAC,CAAC,oCAAoC,CAAC,CAAA;QACvE,KAAK,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,yBAAyB,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAA;QAC/F,KAAK,SAAS,CAAC,CAAC,OAAO,SAAS,CAAC,OAAO,CAAA;IAC1C,CAAC;AACH,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,EAC9B,QAAQ,EACR,MAAM,EACN,OAAO,GAAG,KAAK,EACf,SAAS,EACT,UAAU,EACV,YAAY,EACZ,IAAI,GASL;IACC,MAAM,CAAC,GAAG,mBAAmB,EAAE,CAAA;IAE/B,IAAI,QAAQ,CAAC,MAAM,KAAK,MAAM;QAAE,OAAO,IAAI,CAAA;IAC3C,IAAI,QAAQ,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAClC,OAAO,cAAK,SAAS,EAAC,kBAAkB,oBAAgB,SAAS,YAAE,CAAC,CAAC,iDAAiD,CAAC,GAAO,CAAA;IAChI,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;QAChC,OAAO,CACL,eAAK,SAAS,EAAC,kBAAkB,oBAAgB,OAAO,aACtD,2BAAO,CAAC,CAAC,kBAAkB,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,OAAO,IAAQ,EAC5D,iBAAQ,IAAI,EAAC,QAAQ,EAAC,SAAS,EAAC,sBAAsB,EAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,YAAG,CAAC,CAAC,aAAa,CAAC,GAAU,IAClH,CACP,CAAA;IACH,CAAC;IAED,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAA;IACpC,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,KAAK,SAAS,CAAA;IAC9C,MAAM,aAAa,GAAG,OAAO,IAAI,SAAS,CAAC,MAAM,KAAK,gBAAgB,IAAI,SAAS,CAAC,QAAQ,KAAK,IAAI,CAAA;IACrG,MAAM,MAAM,GAAG,OAAO,IAAI,SAAS,CAAC,MAAM,KAAK,yBAAyB;QACtE,CAAC,CAAC,SAAS,CAAC,OAAO,IAAI,MAAM,EAAE,gBAAgB;QAC/C,CAAC,CAAC,SAAS,CAAA;IACb,OAAO,CACL,eAAK,SAAS,EAAC,kBAAkB,oBAAiB,SAAS,CAAC,MAAM,aAChE,eAAK,SAAS,EAAC,uBAAuB,aACpC,2BAAS,WAAW,CAAC,SAAS,EAAE,CAAC,CAAC,GAAU,EAC5C,yBAAO,CAAC,CAAC,iCAAiC,CAAC,GAAQ,IAC/C,EACL,CAAC,OAAO,IAAI,SAAS,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,CAC5C,cAAI,SAAS,EAAC,wBAAwB,aACpC,0BAAK,uBAAK,CAAC,CAAC,OAAO,CAAC,GAAM,EAAA,yBAAK,SAAS,CAAC,WAAW,IAAI,UAAU,cAAI,yBAAO,QAAQ,CAAC,SAAS,CAAC,YAAY,CAAC,GAAQ,IAAK,IAAM,EAChI,0BAAK,uBAAK,CAAC,CAAC,UAAU,CAAC,GAAM,EAAA,uBAAI,yBAAO,QAAQ,CAAC,SAAS,CAAC,eAAe,CAAC,GAAQ,GAAK,IAAM,EAC9F,0BAAK,uBAAK,CAAC,CAAC,gBAAgB,CAAC,GAAM,EAAA,uBAAI,yBAAO,QAAQ,CAAC,SAAS,CAAC,gBAAgB,CAAC,GAAQ,GAAK,IAAM,EACrG,0BAAK,uBAAK,CAAC,CAAC,SAAS,CAAC,GAAM,EAAA,uBAAK,CAAC,CAAC,aAAa,EAAE,EAAE,KAAK,EAAE,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,GAAM,IAAM,IACpG,CACN,CAAC,CAAC,CAAC,IAAI,EACP,CAAC,OAAO,IAAI,SAAS,CAAC,MAAM,KAAK,UAAU,IAAI,SAAS,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CACtF,aAAI,SAAS,EAAC,sBAAsB,gBAAa,CAAC,CAAC,mBAAmB,CAAC,YACpE,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,uBAAe,yBAAO,IAAI,GAAQ,IAAzB,IAAI,CAA0B,CAAC,GAC7E,CACN,CAAC,CAAC,CAAC,IAAI,EACP,MAAM,CAAC,CAAC,CAAC,wBAAI,CAAC,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,OAAG,CAAC,CAAC,SAAS,CAAC,OAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,cAAK;wBACpH,cAAc,EAAE,CAAC,CAAC,YAAY,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC,mBAAmB,CAAC;wBACzE,SAAS,EAAE,CAAC,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,aAAa,CAAC;wBAC7E,gBAAgB,EAAE,CAAC,CAAC,kBAAkB,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,WAAW,CAAC;qBACnE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAK,CAAC,CAAC,CAAC,IAAI,EAC1B,SAAS,CAAC,MAAM,KAAK,UAAU,IAAI,OAAO,CAAC,CAAC,CAAC,CAC5C,eAAK,SAAS,EAAC,yBAAyB,aACtC,iBAAQ,IAAI,EAAC,QAAQ,EAAC,SAAS,EAAC,sBAAsB,EAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,YAAG,CAAC,CAAC,aAAa,CAAC,GAAU,EACrH,SAAS,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,CACjC,kBAAQ,IAAI,EAAC,QAAQ,EAAC,SAAS,EAAC,sBAAsB,EAAC,QAAQ,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,cAAc,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,aAChJ,CAAC,CAAC,gCAAgC,CAAC,SAAW,CAClD,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAClB,kBAAQ,IAAI,EAAC,QAAQ,EAAC,SAAS,EAAC,sBAAsB,EAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,aACxG,CAAC,CAAC,mBAAmB,CAAC,SAAW,CACrC,CAAC,CAAC,CAAC,IAAI,EACP,MAAM,CAAC,CAAC,CAAC,CACR,iBAAQ,IAAI,EAAC,QAAQ,EAAC,SAAS,EAAC,sBAAsB,EAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,YAAG,CAAC,CAAC,mBAAmB,CAAC,GAAU,CAChI,CAAC,CAAC,CAAC,IAAI,IACJ,CACP,CAAC,CAAC,CAAC,IAAI,IACJ,CACP,CAAA;AACH,CAAC"}
|