@lingjingai/scriptctl 0.53.3 → 0.53.5
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/changes/0.53.4.md +14 -0
- package/changes/0.53.5.md +13 -0
- package/dist/cli/register-query.js +2 -1
- package/dist/cli/register-query.js.map +1 -1
- package/dist/domain/script/shared/validation.d.ts +1 -0
- package/dist/domain/script/shared/validation.js.map +1 -1
- package/dist/domain/script/text-util.js +5 -1
- package/dist/domain/script/text-util.js.map +1 -1
- package/dist/domain/script/v3/patch/helpers.d.ts +0 -2
- package/dist/domain/script/v3/patch/helpers.js +0 -54
- package/dist/domain/script/v3/patch/helpers.js.map +1 -1
- package/dist/domain/script/v3/patch/ops-action.js +1 -13
- package/dist/domain/script/v3/patch/ops-action.js.map +1 -1
- package/dist/domain/script/v3/patch/ops-asset.js +0 -18
- package/dist/domain/script/v3/patch/ops-asset.js.map +1 -1
- package/dist/domain/script/v3/patch/ops-dialogue.js +0 -5
- package/dist/domain/script/v3/patch/ops-dialogue.js.map +1 -1
- package/dist/domain/script/v3/patch/ops-state.js +0 -10
- package/dist/domain/script/v3/patch/ops-state.js.map +1 -1
- package/dist/domain/script/v3/validation.js +22 -5
- package/dist/domain/script/v3/validation.js.map +1 -1
- package/dist/domain/script/v4/patch/ops-action.js +0 -25
- package/dist/domain/script/v4/patch/ops-action.js.map +1 -1
- package/dist/domain/script/v4/patch/ops-asset.js +4 -65
- package/dist/domain/script/v4/patch/ops-asset.js.map +1 -1
- package/dist/domain/script/v4/patch/ops-scene-ref.js +0 -26
- package/dist/domain/script/v4/patch/ops-scene-ref.js.map +1 -1
- package/dist/domain/script/v4/validation.js +26 -4
- package/dist/domain/script/v4/validation.js.map +1 -1
- package/dist/usecases/script/action-span.d.ts +26 -0
- package/dist/usecases/script/action-span.js +169 -0
- package/dist/usecases/script/action-span.js.map +1 -0
- package/dist/usecases/script/actions.js +21 -0
- package/dist/usecases/script/actions.js.map +1 -1
- package/dist/usecases/script/do.js +12 -10
- package/dist/usecases/script/do.js.map +1 -1
- package/dist/usecases/script/lib.js +15 -9
- package/dist/usecases/script/lib.js.map +1 -1
- package/dist/usecases/script/script-patch.js +11 -10
- package/dist/usecases/script/script-patch.js.map +1 -1
- package/dist/usecases/script/session.d.ts +1 -0
- package/dist/usecases/script/session.js +44 -15
- package/dist/usecases/script/session.js.map +1 -1
- package/dist/usecases/script/synopsis-generate.js +2 -2
- package/dist/usecases/script/synopsis-generate.js.map +1 -1
- package/package.json +1 -1
- package/skills/scriptctl/SKILL.md +40 -5
|
@@ -29,8 +29,8 @@ function isSorted(values) {
|
|
|
29
29
|
export function validateScriptV4(doc) {
|
|
30
30
|
const errors = [];
|
|
31
31
|
const warnings = [];
|
|
32
|
-
const err = (code, path, message) => errors.push({ code, path, message });
|
|
33
|
-
const warn = (code, path, message) => warnings.push({ code, path, message });
|
|
32
|
+
const err = (code, path, message, repairHint) => errors.push({ code, path, message, ...(repairHint ? { repair_hint: repairHint } : {}) });
|
|
33
|
+
const warn = (code, path, message, repairHint) => warnings.push({ code, path, message, ...(repairHint ? { repair_hint: repairHint } : {}) });
|
|
34
34
|
if (!isObj(doc)) {
|
|
35
35
|
return {
|
|
36
36
|
ok: false,
|
|
@@ -333,12 +333,34 @@ export function validateScriptV4(doc) {
|
|
|
333
333
|
err("speaker_actor", `${actionPath}.speaker.actor_id`, `actor ${actorId} not found`);
|
|
334
334
|
}
|
|
335
335
|
const sceneStates = sceneActorStates.get(actorId);
|
|
336
|
+
const ownedStates = stateIds.get(actorId);
|
|
337
|
+
const speakerState = isStr(action.speaker.state_id)
|
|
338
|
+
&& ownedStates?.has(action.speaker.state_id)
|
|
339
|
+
? action.speaker.state_id
|
|
340
|
+
: undefined;
|
|
341
|
+
const defaultState = ownedStates?.has("default")
|
|
342
|
+
? "default"
|
|
343
|
+
: ownedStates?.values().next().value;
|
|
344
|
+
const repairStates = speakerState ? [speakerState] : defaultState ? [defaultState] : [];
|
|
345
|
+
const sceneRefRepair = isV4Id("scene", scene.scene_id)
|
|
346
|
+
&& isV4Id("actor", actorId)
|
|
347
|
+
&& repairStates.length > 0
|
|
348
|
+
? `scriptctl scene-ref ${scene.scene_id} ${actorId} ${repairStates.map((id) => `--state ${id}`).join(" ")} -p "$SCRIPT"`
|
|
349
|
+
: undefined;
|
|
336
350
|
if (!sceneStates) {
|
|
337
|
-
err("actor_not_in_scene", `${actionPath}.speaker.actor_id`, `actor ${actorId} is not referenced by this scene
|
|
351
|
+
err("actor_not_in_scene", `${actionPath}.speaker.actor_id`, `actor ${actorId} is not referenced by this scene`, sceneRefRepair);
|
|
338
352
|
}
|
|
339
353
|
if (action.speaker.state_id !== undefined
|
|
340
354
|
&& (!isStr(action.speaker.state_id) || !sceneStates?.has(action.speaker.state_id))) {
|
|
341
|
-
|
|
355
|
+
const nextStates = speakerState
|
|
356
|
+
? [...new Set([...(sceneStates ?? []), speakerState])].sort()
|
|
357
|
+
: [];
|
|
358
|
+
const stateRepair = isV4Id("scene", scene.scene_id)
|
|
359
|
+
&& isV4Id("actor", actorId)
|
|
360
|
+
&& nextStates.length > 0
|
|
361
|
+
? `scriptctl scene-ref ${scene.scene_id} ${actorId} ${nextStates.map((id) => `--state ${id}`).join(" ")} -p "$SCRIPT"`
|
|
362
|
+
: sceneRefRepair;
|
|
363
|
+
err("speaker_state", `${actionPath}.speaker.state_id`, `speaker state ${String(action.speaker.state_id)} is not in this scene's actor state_ids`, stateRepair);
|
|
342
364
|
}
|
|
343
365
|
}
|
|
344
366
|
else if (isStr(action.speaker.kind)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../src/domain/script/v4/validation.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../src/domain/script/v4/validation.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { type CommandOutput } from "../../common.js";
|
|
2
|
+
import type { ScriptV3 } from "../../domain/script/v3/types.js";
|
|
3
|
+
import type { ScriptV4 } from "../../domain/script/v4/types.js";
|
|
4
|
+
export interface ActionSpanPoint {
|
|
5
|
+
address: string;
|
|
6
|
+
episodeId: string;
|
|
7
|
+
episodeNo: number;
|
|
8
|
+
timestamp?: string;
|
|
9
|
+
}
|
|
10
|
+
export interface ActionSpanRow extends Record<string, unknown> {
|
|
11
|
+
episode_id: string;
|
|
12
|
+
ep_no: number;
|
|
13
|
+
start_timestamp: string;
|
|
14
|
+
last_selected_timestamp: string;
|
|
15
|
+
end_timestamp: string;
|
|
16
|
+
end_open: boolean;
|
|
17
|
+
end_exclusive: true;
|
|
18
|
+
start_action: string;
|
|
19
|
+
last_action: string;
|
|
20
|
+
end_boundary_action: string;
|
|
21
|
+
matched_actions: number;
|
|
22
|
+
}
|
|
23
|
+
export declare function actionSpanPointsV3(script: ScriptV3): ActionSpanPoint[];
|
|
24
|
+
export declare function actionSpanPointsV4(script: ScriptV4): ActionSpanPoint[];
|
|
25
|
+
export declare function resolveActionSpan(timeline: readonly ActionSpanPoint[], selectedAddresses: readonly string[]): ActionSpanRow;
|
|
26
|
+
export declare function actionSpanOutput(row: ActionSpanRow): CommandOutput;
|
|
@@ -0,0 +1,169 @@
|
|
|
1
|
+
import { CliError, EXIT_INPUT, EXIT_RUNTIME, } from "../../common.js";
|
|
2
|
+
import { parseTimestamp, TimestampParseError, } from "../../domain/script/timestamp.js";
|
|
3
|
+
function actionTimestamp(extend) {
|
|
4
|
+
const timestamp = extend?.timestamp;
|
|
5
|
+
if (typeof timestamp !== "string")
|
|
6
|
+
return undefined;
|
|
7
|
+
const trimmed = timestamp.trim();
|
|
8
|
+
return trimmed || undefined;
|
|
9
|
+
}
|
|
10
|
+
export function actionSpanPointsV3(script) {
|
|
11
|
+
return script.episodes.flatMap((episode, episodeIndex) => episode.scenes.flatMap((scene) => scene.actions.map((action, actionIndex) => ({
|
|
12
|
+
address: `${episode.episode_id}/${scene.scene_id}#${actionIndex}`,
|
|
13
|
+
episodeId: episode.episode_id,
|
|
14
|
+
episodeNo: episodeIndex + 1,
|
|
15
|
+
timestamp: actionTimestamp(action.extend),
|
|
16
|
+
}))));
|
|
17
|
+
}
|
|
18
|
+
export function actionSpanPointsV4(script) {
|
|
19
|
+
return script.episodes.flatMap((episode, episodeIndex) => episode.scenes.flatMap((scene) => scene.actions.map((action) => ({
|
|
20
|
+
address: action.action_id,
|
|
21
|
+
episodeId: episode.episode_id,
|
|
22
|
+
episodeNo: episodeIndex + 1,
|
|
23
|
+
timestamp: actionTimestamp(action.extend),
|
|
24
|
+
}))));
|
|
25
|
+
}
|
|
26
|
+
function parsePointTimestamp(point) {
|
|
27
|
+
try {
|
|
28
|
+
return parseTimestamp(point.timestamp ?? "");
|
|
29
|
+
}
|
|
30
|
+
catch (error) {
|
|
31
|
+
if (!(error instanceof TimestampParseError))
|
|
32
|
+
throw error;
|
|
33
|
+
throw new CliError(`Action ${point.address} has an invalid stored timestamp.`, {
|
|
34
|
+
exitCode: EXIT_INPUT,
|
|
35
|
+
errorCode: "ACTION_SPAN_TIMESTAMP_INVALID",
|
|
36
|
+
hint: `Fix it with \`scriptctl timestamp ${point.address} --set <time>\` or remove it.`,
|
|
37
|
+
data: {
|
|
38
|
+
expected: ["valid action.extend.timestamp"],
|
|
39
|
+
actual: [`${point.address}: ${JSON.stringify(point.timestamp ?? "")}`],
|
|
40
|
+
},
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
function nonMonotonic(previous, current) {
|
|
45
|
+
throw new CliError("Action timestamps run backward within the selected episode.", {
|
|
46
|
+
exitCode: EXIT_INPUT,
|
|
47
|
+
errorCode: "ACTION_SPAN_TIMESTAMP_NON_MONOTONIC",
|
|
48
|
+
hint: "Fix the stored timestamps so they increase in document order, then rerun `actions --span`.",
|
|
49
|
+
data: {
|
|
50
|
+
actual: [
|
|
51
|
+
`${previous.address}: ${previous.timestamp}`,
|
|
52
|
+
`${current.address}: ${current.timestamp}`,
|
|
53
|
+
],
|
|
54
|
+
},
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
export function resolveActionSpan(timeline, selectedAddresses) {
|
|
58
|
+
if (selectedAddresses.length === 0) {
|
|
59
|
+
throw new CliError("The action selection matched nothing.", {
|
|
60
|
+
exitCode: EXIT_INPUT,
|
|
61
|
+
errorCode: "ACTION_SPAN_NO_MATCH",
|
|
62
|
+
hint: "Check the selector with `scriptctl actions` and rerun with `--span`.",
|
|
63
|
+
data: { actual: ["0 matched actions"] },
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
const selectedSet = new Set(selectedAddresses);
|
|
67
|
+
const selected = timeline.filter((point) => selectedSet.has(point.address));
|
|
68
|
+
if (selected.length !== selectedSet.size) {
|
|
69
|
+
throw new CliError("The resolved action selection is inconsistent with the script timeline.", {
|
|
70
|
+
exitCode: EXIT_RUNTIME,
|
|
71
|
+
errorCode: "ACTION_SPAN_SELECTION_INCONSISTENT",
|
|
72
|
+
data: {
|
|
73
|
+
expected: [`${selectedSet.size} timeline actions`],
|
|
74
|
+
actual: [`${selected.length} timeline actions`],
|
|
75
|
+
},
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
const episodeIds = new Set(selected.map((point) => point.episodeId));
|
|
79
|
+
if (episodeIds.size !== 1) {
|
|
80
|
+
throw new CliError("An action timestamp span must stay within one episode.", {
|
|
81
|
+
exitCode: EXIT_INPUT,
|
|
82
|
+
errorCode: "ACTION_SPAN_CROSSES_EPISODES",
|
|
83
|
+
hint: "Split the selector into one `actions --span` call per episode.",
|
|
84
|
+
data: { actual: [...episodeIds] },
|
|
85
|
+
});
|
|
86
|
+
}
|
|
87
|
+
const first = selected[0];
|
|
88
|
+
const last = selected[selected.length - 1];
|
|
89
|
+
if (!first.timestamp) {
|
|
90
|
+
throw new CliError(`The first selected Action ${first.address} has no timestamp.`, {
|
|
91
|
+
exitCode: EXIT_INPUT,
|
|
92
|
+
errorCode: "ACTION_SPAN_START_TIMESTAMP_MISSING",
|
|
93
|
+
hint: `Set it with \`scriptctl timestamp ${first.address} --set <time>\`, then rerun.`,
|
|
94
|
+
data: { actual: [first.address] },
|
|
95
|
+
});
|
|
96
|
+
}
|
|
97
|
+
const start = parsePointTimestamp(first);
|
|
98
|
+
let previousStampedPoint = first;
|
|
99
|
+
let previousTimestamp = start;
|
|
100
|
+
let lastSelectedTimestamp = "";
|
|
101
|
+
for (const point of selected) {
|
|
102
|
+
if (!point.timestamp)
|
|
103
|
+
continue;
|
|
104
|
+
const timestamp = parsePointTimestamp(point);
|
|
105
|
+
if (timestamp.milliseconds < previousTimestamp.milliseconds) {
|
|
106
|
+
nonMonotonic(previousStampedPoint, point);
|
|
107
|
+
}
|
|
108
|
+
previousStampedPoint = point;
|
|
109
|
+
previousTimestamp = timestamp;
|
|
110
|
+
if (point.address === last.address)
|
|
111
|
+
lastSelectedTimestamp = timestamp.canonical;
|
|
112
|
+
}
|
|
113
|
+
const lastTimelineIndex = timeline.findIndex((point) => point.address === last.address);
|
|
114
|
+
let boundary;
|
|
115
|
+
let boundaryTimestamp;
|
|
116
|
+
for (let index = lastTimelineIndex + 1; index < timeline.length; index += 1) {
|
|
117
|
+
const candidate = timeline[index];
|
|
118
|
+
if (candidate.episodeId !== first.episodeId)
|
|
119
|
+
break;
|
|
120
|
+
if (!candidate.timestamp)
|
|
121
|
+
continue;
|
|
122
|
+
const timestamp = parsePointTimestamp(candidate);
|
|
123
|
+
if (timestamp.milliseconds < previousTimestamp.milliseconds) {
|
|
124
|
+
nonMonotonic(previousStampedPoint, candidate);
|
|
125
|
+
}
|
|
126
|
+
if (timestamp.milliseconds === previousTimestamp.milliseconds)
|
|
127
|
+
continue;
|
|
128
|
+
boundary = candidate;
|
|
129
|
+
boundaryTimestamp = timestamp;
|
|
130
|
+
break;
|
|
131
|
+
}
|
|
132
|
+
return {
|
|
133
|
+
episode_id: first.episodeId,
|
|
134
|
+
ep_no: first.episodeNo,
|
|
135
|
+
start_timestamp: start.canonical,
|
|
136
|
+
last_selected_timestamp: lastSelectedTimestamp,
|
|
137
|
+
end_timestamp: boundaryTimestamp?.canonical ?? "",
|
|
138
|
+
end_open: boundaryTimestamp === undefined,
|
|
139
|
+
end_exclusive: true,
|
|
140
|
+
start_action: first.address,
|
|
141
|
+
last_action: last.address,
|
|
142
|
+
end_boundary_action: boundary?.address ?? "",
|
|
143
|
+
matched_actions: selected.length,
|
|
144
|
+
};
|
|
145
|
+
}
|
|
146
|
+
export function actionSpanOutput(row) {
|
|
147
|
+
const rowColumns = [
|
|
148
|
+
"episode_id",
|
|
149
|
+
"ep_no",
|
|
150
|
+
"start_timestamp",
|
|
151
|
+
"last_selected_timestamp",
|
|
152
|
+
"end_timestamp",
|
|
153
|
+
"end_open",
|
|
154
|
+
"end_exclusive",
|
|
155
|
+
"start_action",
|
|
156
|
+
"last_action",
|
|
157
|
+
"end_boundary_action",
|
|
158
|
+
"matched_actions",
|
|
159
|
+
];
|
|
160
|
+
return {
|
|
161
|
+
text: rowColumns.map((column) => String(row[column])).join("\t"),
|
|
162
|
+
data: {
|
|
163
|
+
op: "query.action-span",
|
|
164
|
+
row_columns: rowColumns,
|
|
165
|
+
rows: [row],
|
|
166
|
+
},
|
|
167
|
+
};
|
|
168
|
+
}
|
|
169
|
+
//# sourceMappingURL=action-span.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"action-span.js","sourceRoot":"","sources":["../../../src/usecases/script/action-span.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,10 @@ import { asList, strOf, } from "../../domain/script/shared.js";
|
|
|
3
3
|
import { loadScriptForEdit, } from "./session.js";
|
|
4
4
|
import { actionAddress, actionDisplayFields, formatInspectAction, buildTableReport, resolveActionTargets, } from "./lib.js";
|
|
5
5
|
import { normalizeV3QuerySelector } from "../../domain/script/v3/ordinal.js";
|
|
6
|
+
import { requireScriptV3 } from "../../domain/script/v3/parse.js";
|
|
6
7
|
import { listActionLocationsV4 } from "../../domain/script/v4/address.js";
|
|
7
8
|
import { requireStructurallyReadableScriptV4 } from "../../domain/script/v4/parse.js";
|
|
9
|
+
import { actionSpanOutput, actionSpanPointsV3, actionSpanPointsV4, resolveActionSpan, } from "./action-span.js";
|
|
8
10
|
import { actionDisplayFieldsV4, formatActionV4, resolveActionTargetsV4, } from "./v4/queries.js";
|
|
9
11
|
export async function commandActions(opts) {
|
|
10
12
|
const session = await loadScriptForEdit(opts);
|
|
@@ -30,9 +32,22 @@ export async function commandActions(opts) {
|
|
|
30
32
|
data: { expected: ["at least one of --in / --grep / --type / --actor / --has / --time"], actual: ["<empty>"] },
|
|
31
33
|
});
|
|
32
34
|
}
|
|
35
|
+
if (opts["span"] && contextN > 0) {
|
|
36
|
+
throw new CliError("`actions --span` cannot be combined with `--context`.", {
|
|
37
|
+
exitCode: EXIT_USAGE,
|
|
38
|
+
errorCode: "ACTION_SPAN_CONTEXT_CONFLICT",
|
|
39
|
+
hint: "Remove `--context`; the span is computed from the selected Actions only.",
|
|
40
|
+
});
|
|
41
|
+
}
|
|
33
42
|
if (session.version === 4) {
|
|
34
43
|
const scriptV4 = requireStructurallyReadableScriptV4(script);
|
|
35
44
|
const allInScope = resolveActionTargetsV4(scriptV4, opts);
|
|
45
|
+
if (opts["span"]) {
|
|
46
|
+
return [
|
|
47
|
+
actionSpanOutput(resolveActionSpan(actionSpanPointsV4(scriptV4), allInScope.map((row) => row.action.action_id))),
|
|
48
|
+
EXIT_OK,
|
|
49
|
+
];
|
|
50
|
+
}
|
|
36
51
|
const matchIds = new Set(allInScope.map((row) => row.action.action_id));
|
|
37
52
|
let displayed = allInScope;
|
|
38
53
|
if (contextN > 0 && matchIds.size > 0) {
|
|
@@ -85,6 +100,12 @@ export async function commandActions(opts) {
|
|
|
85
100
|
in: normalizeV3QuerySelector(script, opts["in"]),
|
|
86
101
|
};
|
|
87
102
|
const allInScope = resolveActionTargets(script, queryOpts);
|
|
103
|
+
if (opts["span"]) {
|
|
104
|
+
return [
|
|
105
|
+
actionSpanOutput(resolveActionSpan(actionSpanPointsV3(requireScriptV3(script)), allInScope.map((target) => actionAddress(target.epId, target.sceneId, target.idx)))),
|
|
106
|
+
EXIT_OK,
|
|
107
|
+
];
|
|
108
|
+
}
|
|
88
109
|
const matchKeys = new Set(allInScope.map((h) => `${h.epId}/${h.sceneId}#${h.idx}`));
|
|
89
110
|
// --context N: expand matches to include neighbors within each scene. `lines`
|
|
90
111
|
// (text) and `rows` (machine) are both built from the SAME displayed set so
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../src/usecases/script/actions.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../src/usecases/script/actions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import * as fs from "node:fs";
|
|
2
|
-
import { CliError, EXIT_INPUT,
|
|
2
|
+
import { CliError, EXIT_INPUT, EXIT_OK, EXIT_USAGE, exists, readText, } from "../../common.js";
|
|
3
3
|
import { summarizeIssues } from "../../domain/script/text-util.js";
|
|
4
4
|
import { asList, strOf, } from "../../domain/script/shared.js";
|
|
5
|
-
import { loadScriptForEdit, validateSession, saveScriptSession, syncValidationResult, scriptSourceText, } from "./session.js";
|
|
5
|
+
import { loadScriptForEdit, validateSession, saveScriptSession, syncValidationResult, scriptSourceText, mutationValidationWarnings, } from "./session.js";
|
|
6
6
|
import { tokenizeLine, parseDoLine, doErr, lineToOp, applyPatchOperationsForSession, assertV4PlanHasExplicitNewIds, buildV4MutationPlan, } from "./lib.js";
|
|
7
7
|
export async function commandDo(opts) {
|
|
8
8
|
const file = strOf(asList(opts["_args"])[0]);
|
|
@@ -128,11 +128,9 @@ export async function commandDo(opts) {
|
|
|
128
128
|
? []
|
|
129
129
|
: summarizeIssues(asList(legacyValidation["issues"]));
|
|
130
130
|
const issues = plannedIssueLines ?? legacyIssueLines;
|
|
131
|
-
const hint =
|
|
132
|
-
? planDigest
|
|
133
|
-
|
|
134
|
-
: "Run `scriptctl do --apply` with the same input to commit."
|
|
135
|
-
: "Resolve validation issues before committing.";
|
|
131
|
+
const hint = planDigest
|
|
132
|
+
? `Run \`scriptctl do --apply --plan ${planDigest}\` with the same input to commit${passed ? "." : "; validation issues will remain available as follow-up diagnostics."}`
|
|
133
|
+
: `Run \`scriptctl do --apply\` with the same input to commit${passed ? "." : "; validation issues will remain available as follow-up diagnostics."}`;
|
|
136
134
|
const lines = [...head, `validation: ${passed ? "would pass" : "would need repair"}; no write`, ...issues, hint];
|
|
137
135
|
const report = {
|
|
138
136
|
text: lines.join("\n"),
|
|
@@ -152,15 +150,17 @@ export async function commandDo(opts) {
|
|
|
152
150
|
} : {}),
|
|
153
151
|
},
|
|
154
152
|
};
|
|
155
|
-
return [report,
|
|
153
|
+
return [report, EXIT_OK];
|
|
156
154
|
}
|
|
157
155
|
const [newRevision, idempotent] = await saveScriptSession(session, opts, "do");
|
|
158
156
|
const validation = validateSession(session);
|
|
159
157
|
await syncValidationResult(session, validation, newRevision);
|
|
160
158
|
const passed = Boolean(validation["passed"]);
|
|
159
|
+
const warnings = mutationValidationWarnings(session, validation);
|
|
161
160
|
const rev = session.remote ? `; rev ${newRevision}` : "";
|
|
162
161
|
const issues = summarizeIssues(asList(validation["issues"]));
|
|
163
|
-
const
|
|
162
|
+
const warningLines = summarizeIssues(warnings);
|
|
163
|
+
const lines = [...head, `validation: ${passed ? "passed" : "needs repair"}${rev}`, ...warningLines];
|
|
164
164
|
const report = {
|
|
165
165
|
text: lines.join("\n"),
|
|
166
166
|
data: {
|
|
@@ -168,7 +168,9 @@ export async function commandDo(opts) {
|
|
|
168
168
|
changed: applied.length > 0,
|
|
169
169
|
revision: session.remote ? newRevision : undefined,
|
|
170
170
|
idempotent: session.remote ? idempotent : undefined,
|
|
171
|
+
validation,
|
|
171
172
|
issues,
|
|
173
|
+
warnings,
|
|
172
174
|
script_path: session.artifactLabel,
|
|
173
175
|
...(planDigest ? {
|
|
174
176
|
baseline: session.baselineHash,
|
|
@@ -179,6 +181,6 @@ export async function commandDo(opts) {
|
|
|
179
181
|
} : {}),
|
|
180
182
|
},
|
|
181
183
|
};
|
|
182
|
-
return [report,
|
|
184
|
+
return [report, EXIT_OK];
|
|
183
185
|
}
|
|
184
186
|
//# sourceMappingURL=do.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"do.js","sourceRoot":"","sources":["../../../src/usecases/script/do.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAK9B,OAAO,EACL,QAAQ,EACR,UAAU,EACV,
|
|
1
|
+
{"version":3,"file":"do.js","sourceRoot":"","sources":["../../../src/usecases/script/do.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CliError, EXIT_INPUT,
|
|
1
|
+
import { CliError, EXIT_INPUT, EXIT_OK, EXIT_USAGE, sha256Text, } from "../../common.js";
|
|
2
2
|
import { applyPatchOperationsV4 } from "../../domain/script/v4/patch/apply.js";
|
|
3
3
|
import { isV4Id } from "../../domain/script/v4/ids.js";
|
|
4
4
|
import { requireStructurallyReadableScriptV4 } from "../../domain/script/v4/parse.js";
|
|
@@ -10,7 +10,7 @@ import { parseV4Address } from "../../domain/script/v4/address.js";
|
|
|
10
10
|
import { summarizeIssues } from "../../domain/script/text-util.js";
|
|
11
11
|
import { sortDeep } from "../../domain/script/text-util.js";
|
|
12
12
|
import { asList, idNum, isDict, strOf, } from "../../domain/script/shared.js";
|
|
13
|
-
import { loadScriptForEdit, validateSession, saveScriptSession, syncValidationResult, scriptSourceText, } from "./session.js";
|
|
13
|
+
import { loadScriptForEdit, validateSession, saveScriptSession, syncValidationResult, scriptSourceText, mutationValidationWarnings, } from "./session.js";
|
|
14
14
|
import { resolveActionTargetsV4 } from "./v4/queries.js";
|
|
15
15
|
import { actionTimestampFilter, actionTimestampMatches } from "./timestamp-filter.js";
|
|
16
16
|
import { applyVersionedMutations } from "./dispatch.js";
|
|
@@ -1006,12 +1006,14 @@ export async function applyScriptOpsToSession(session, opts, operations) {
|
|
|
1006
1006
|
const validation = validateSession(session);
|
|
1007
1007
|
await syncValidationResult(session, validation, newRevision);
|
|
1008
1008
|
const passed = Boolean(validation["passed"]);
|
|
1009
|
+
const warnings = mutationValidationWarnings(session, validation);
|
|
1009
1010
|
// One outcome line: what changed + revision (remote) + validation verdict.
|
|
1010
1011
|
const rev = session.remote ? `; rev ${newRevision}` : "";
|
|
1011
1012
|
const resultLine = `${applied.join(", ")} applied${rev}; validation ${passed ? "passed" : "needs repair"}`;
|
|
1012
1013
|
const issues = summarizeIssues(asList(validation["issues"]));
|
|
1014
|
+
const warningLines = summarizeIssues(warnings);
|
|
1013
1015
|
const report = {
|
|
1014
|
-
text: [resultLine, ...
|
|
1016
|
+
text: [resultLine, ...warningLines].join("\n"),
|
|
1015
1017
|
data: {
|
|
1016
1018
|
op: opName,
|
|
1017
1019
|
changed: applied.length > 0,
|
|
@@ -1019,10 +1021,11 @@ export async function applyScriptOpsToSession(session, opts, operations) {
|
|
|
1019
1021
|
idempotent: session.remote ? idempotent : undefined,
|
|
1020
1022
|
validation,
|
|
1021
1023
|
issues,
|
|
1024
|
+
warnings,
|
|
1022
1025
|
script_path: session.artifactLabel,
|
|
1023
1026
|
},
|
|
1024
1027
|
};
|
|
1025
|
-
return [report,
|
|
1028
|
+
return [report, EXIT_OK];
|
|
1026
1029
|
}
|
|
1027
1030
|
export async function applySingleScriptOp(opts, op) {
|
|
1028
1031
|
const session = await loadScriptForEdit(opts);
|
|
@@ -1166,8 +1169,8 @@ export async function applySelectorEditsToSession(session, opts, template, verbL
|
|
|
1166
1169
|
const hint = refs.length === 0
|
|
1167
1170
|
? "Widen the selection with --in, --grep, or predicates."
|
|
1168
1171
|
: planDigest
|
|
1169
|
-
? `Run again with --apply --plan ${planDigest} to commit this exact plan
|
|
1170
|
-
:
|
|
1172
|
+
? `Run again with --apply --plan ${planDigest} to commit this exact plan${passed ? "." : "; validation issues will remain available as follow-up diagnostics."}`
|
|
1173
|
+
: `Run again with --apply to commit${passed ? "." : "; validation issues will remain available as follow-up diagnostics."}`;
|
|
1171
1174
|
const lines = [...blast, `validation: ${passed ? "would pass" : "would need repair"}; no write`, ...issues, hint];
|
|
1172
1175
|
const report = {
|
|
1173
1176
|
text: lines.join("\n"),
|
|
@@ -1188,7 +1191,7 @@ export async function applySelectorEditsToSession(session, opts, template, verbL
|
|
|
1188
1191
|
} : {}),
|
|
1189
1192
|
},
|
|
1190
1193
|
};
|
|
1191
|
-
return [report,
|
|
1194
|
+
return [report, EXIT_OK];
|
|
1192
1195
|
}
|
|
1193
1196
|
if (refs.length === 0) {
|
|
1194
1197
|
return [{
|
|
@@ -1205,10 +1208,12 @@ export async function applySelectorEditsToSession(session, opts, template, verbL
|
|
|
1205
1208
|
const validation = validateSession(session);
|
|
1206
1209
|
await syncValidationResult(session, validation, newRevision);
|
|
1207
1210
|
const passed = Boolean(validation["passed"]);
|
|
1211
|
+
const warnings = mutationValidationWarnings(session, validation);
|
|
1208
1212
|
const rev = session.remote ? `; rev ${newRevision}` : "";
|
|
1209
1213
|
const issues = summarizeIssues(asList(validation["issues"]));
|
|
1214
|
+
const warningLines = summarizeIssues(warnings);
|
|
1210
1215
|
const report = {
|
|
1211
|
-
text: [...blast, `validation: ${passed ? "passed" : "needs repair"}${rev}`, ...
|
|
1216
|
+
text: [...blast, `validation: ${passed ? "passed" : "needs repair"}${rev}`, ...warningLines].join("\n"),
|
|
1212
1217
|
data: {
|
|
1213
1218
|
op: opName,
|
|
1214
1219
|
changed: applied > 0,
|
|
@@ -1219,6 +1224,7 @@ export async function applySelectorEditsToSession(session, opts, template, verbL
|
|
|
1219
1224
|
idempotent: session.remote ? idempotent : undefined,
|
|
1220
1225
|
validation,
|
|
1221
1226
|
issues,
|
|
1227
|
+
warnings,
|
|
1222
1228
|
script_path: session.artifactLabel,
|
|
1223
1229
|
...(planDigest ? {
|
|
1224
1230
|
baseline: session.baselineHash,
|
|
@@ -1229,7 +1235,7 @@ export async function applySelectorEditsToSession(session, opts, template, verbL
|
|
|
1229
1235
|
} : {}),
|
|
1230
1236
|
},
|
|
1231
1237
|
};
|
|
1232
|
-
return [report,
|
|
1238
|
+
return [report, EXIT_OK];
|
|
1233
1239
|
}
|
|
1234
1240
|
export async function applySelectorEdits(opts, template, verbLabel) {
|
|
1235
1241
|
const session = await loadScriptForEdit(opts);
|