@farmslot/agent-runtime 0.22.4 → 0.23.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 +5 -0
- package/dist/native/host-cleanup-recovery.d.ts.map +1 -1
- package/dist/native/host-cleanup-recovery.js +12 -6
- package/dist/native/host-cleanup-recovery.js.map +1 -1
- package/dist/native/workspace.d.ts.map +1 -1
- package/dist/native/workspace.js +2 -1
- package/dist/native/workspace.js.map +1 -1
- package/dist/task-init/branch-update.d.ts.map +1 -1
- package/dist/task-init/branch-update.js +2 -1
- package/dist/task-init/branch-update.js.map +1 -1
- package/package.json +8 -3
- package/scripts/git-diff.cjs +43 -0
- package/scripts/git-diff.d.cts +3 -0
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,11 @@
|
|
|
4
4
|
|
|
5
5
|
- Active-development baseline; add user-facing changes here before release or package publication.
|
|
6
6
|
|
|
7
|
+
## 0.23.0 - 2026-10-15
|
|
8
|
+
|
|
9
|
+
- Keep source and review diff identities stable across user Git settings; disable external diff and text conversion.
|
|
10
|
+
- Recover a stopped native host whose first process census failed before any session started, preserving the unmatched marker in quarantine and retaining all journals.
|
|
11
|
+
|
|
7
12
|
## 0.22.4 - 2026-10-15
|
|
8
13
|
|
|
9
14
|
- Align the installed dependency closure with protocol 0.45.0 and retained-run stack attachment.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"host-cleanup-recovery.d.ts","sourceRoot":"","sources":["../../src/native/host-cleanup-recovery.ts"],"names":[],"mappings":"AA+CA,+EAA+E;AAC/E,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,MAAM,GACd,IAAI,
|
|
1
|
+
{"version":3,"file":"host-cleanup-recovery.d.ts","sourceRoot":"","sources":["../../src/native/host-cleanup-recovery.ts"],"names":[],"mappings":"AA+CA,+EAA+E;AAC/E,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,MAAM,GACd,IAAI,CA4HN"}
|
|
@@ -38,8 +38,7 @@ export function recoverStoppedNativeHost(root, supervisorPid, hostPid) {
|
|
|
38
38
|
!object(cleanup) ||
|
|
39
39
|
cleanup.hostPid !== hostPid ||
|
|
40
40
|
!['pending', 'unknown'].includes(String(cleanup.state)) ||
|
|
41
|
-
!Array.isArray(cleanup.observedProcesses)
|
|
42
|
-
!cleanup.observedProcesses.length)
|
|
41
|
+
(cleanup.observedProcesses !== undefined && !Array.isArray(cleanup.observedProcesses)))
|
|
43
42
|
throw new Error('Native cleanup recovery requires matching recorded host evidence');
|
|
44
43
|
const pids = new Set([supervisorPid, hostPid]);
|
|
45
44
|
const groups = new Set([supervisorPid]);
|
|
@@ -51,12 +50,13 @@ export function recoverStoppedNativeHost(root, supervisorPid, hostPid) {
|
|
|
51
50
|
return entry;
|
|
52
51
|
};
|
|
53
52
|
let hostObserved = false;
|
|
54
|
-
|
|
53
|
+
const observations = Array.isArray(cleanup.observedProcesses) ? cleanup.observedProcesses : [];
|
|
54
|
+
for (const entry of observations) {
|
|
55
55
|
const observed = observe(processEvidence(entry));
|
|
56
56
|
if (observed.pid === hostPid && observed.parent === supervisorPid)
|
|
57
57
|
hostObserved = true;
|
|
58
58
|
}
|
|
59
|
-
if (!hostObserved)
|
|
59
|
+
if (!hostObserved && observations.length)
|
|
60
60
|
throw new Error('Native cleanup recovery cannot identify the old host');
|
|
61
61
|
const journals = {};
|
|
62
62
|
const sessionRoot = join(root, 'sessions');
|
|
@@ -74,6 +74,9 @@ export function recoverStoppedNativeHost(root, supervisorPid, hostPid) {
|
|
|
74
74
|
if (entry.info !== undefined) {
|
|
75
75
|
if (!object(entry.info) || typeof entry.info.generation !== 'string')
|
|
76
76
|
throw new Error('Native cleanup recovery has malformed session identity');
|
|
77
|
+
// An unobserved startup can be quarantined only if it never owned a session.
|
|
78
|
+
if (!hostObserved && (!pid(entry.info.hostPid) || entry.info.hostPid === hostPid))
|
|
79
|
+
throw new Error('Unobserved native host recovery cannot exclude a session from that host');
|
|
77
80
|
info = entry.info;
|
|
78
81
|
projected.info = { generation: entry.info.generation };
|
|
79
82
|
}
|
|
@@ -125,11 +128,14 @@ export function recoverStoppedNativeHost(root, supervisorPid, hostPid) {
|
|
|
125
128
|
for (const [name, hash] of Object.entries(journals))
|
|
126
129
|
if (digest(privateBytes(join(sessionRoot, name))) !== hash)
|
|
127
130
|
throw new Error('Native session journal changed during cleanup recovery');
|
|
128
|
-
const
|
|
131
|
+
const historyName = hostObserved ? 'cleanup-recoveries' : 'cleanup-quarantine';
|
|
132
|
+
const history = join(root, historyName);
|
|
129
133
|
privateDirectory(history);
|
|
130
134
|
const receipt = `${randomUUID()}.json`;
|
|
131
135
|
durableWrite(join(history, receipt), {
|
|
132
136
|
schemaVersion: 1,
|
|
137
|
+
quarantined: !hostObserved,
|
|
138
|
+
...(!hostObserved ? { originalCleanupBytesBase64: original.toString('base64') } : {}),
|
|
133
139
|
verifiedAt: new Date().toISOString(),
|
|
134
140
|
supervisorPid,
|
|
135
141
|
hostPid,
|
|
@@ -143,7 +149,7 @@ export function recoverStoppedNativeHost(root, supervisorPid, hostPid) {
|
|
|
143
149
|
durableWrite(cleanupPath, {
|
|
144
150
|
...cleanup,
|
|
145
151
|
state: 'complete',
|
|
146
|
-
recoveryReceipt:
|
|
152
|
+
recoveryReceipt: `${historyName}/${receipt}`,
|
|
147
153
|
});
|
|
148
154
|
}
|
|
149
155
|
//# sourceMappingURL=host-cleanup-recovery.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"host-cleanup-recovery.js","sourceRoot":"","sources":["../../src/native/host-cleanup-recovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EACL,gBAAgB,EAGhB,yBAAyB,GAC1B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,KAAK,EACL,YAAY,EACZ,gBAAgB,EAChB,oBAAoB,EACpB,QAAQ,EACR,yBAAyB,GAC1B,MAAM,cAAc,CAAC;AAEtB,SAAS,MAAM,CAAC,KAAc;IAC5B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AACD,SAAS,GAAG,CAAC,KAAc;IACzB,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC;AAC/E,CAAC;AACD,SAAS,YAAY,CAAC,IAAY;IAChC,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAC7B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,CAAC,GAAG,KAAK,OAAO,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC;QAChF,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;IACnF,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC;AACD,SAAS,MAAM,CAAC,KAAa;IAC3B,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC1D,CAAC;AACD,SAAS,eAAe,CAAC,KAAc;IACrC,IACE,CAAC,MAAM,CAAC,KAAK,CAAC;QACd,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC;QACf,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC;QAClB,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC;QACjB,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ;QAClC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE;QAEtB,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;IAC5E,OAAO,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC;AAChG,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,wBAAwB,CACtC,IAAY,EACZ,aAAqB,EACrB,OAAe;IAEf,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAY,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;IACzD,IACE,CAAC,GAAG,CAAC,aAAa,CAAC;QACnB,CAAC,GAAG,CAAC,OAAO,CAAC;QACb,CAAC,MAAM,CAAC,OAAO,CAAC;QAChB,OAAO,CAAC,OAAO,KAAK,OAAO;QAC3B,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACvD,CAAC,
|
|
1
|
+
{"version":3,"file":"host-cleanup-recovery.js","sourceRoot":"","sources":["../../src/native/host-cleanup-recovery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../src/native/workspace.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,4BAA4B,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../src/native/workspace.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,4BAA4B,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AA+ClG,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,yBAAyB,CAAC,CAkBpC;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,MAAM,EACX,QAAQ,SAAM,GACb,OAAO,CAAC,4BAA4B,CAAC,CA0BvC;AAED,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAiCxF"}
|
package/dist/native/workspace.js
CHANGED
|
@@ -2,6 +2,7 @@ import { execFile as execFileCallback } from 'node:child_process';
|
|
|
2
2
|
import { opendir, realpath } from 'node:fs/promises';
|
|
3
3
|
import path from 'node:path';
|
|
4
4
|
import { promisify } from 'node:util';
|
|
5
|
+
import { gitDiffArgs } from '../../scripts/git-diff.cjs';
|
|
5
6
|
import { readWorkspaceText, WORKSPACE_TEXT_LIMIT, workspacePath } from './workspace-files.js';
|
|
6
7
|
const execFile = promisify(execFileCallback);
|
|
7
8
|
const STATUS_OUTPUT_LIMIT = 8 * WORKSPACE_TEXT_LIMIT;
|
|
@@ -15,7 +16,7 @@ async function git(cwd, args, maxBuffer = WORKSPACE_TEXT_LIMIT) {
|
|
|
15
16
|
'core.quotePath=false',
|
|
16
17
|
'-c',
|
|
17
18
|
'core.fsmonitor=false',
|
|
18
|
-
...args,
|
|
19
|
+
...(args[0] === 'diff' ? gitDiffArgs(args.slice(1)) : args),
|
|
19
20
|
], {
|
|
20
21
|
cwd,
|
|
21
22
|
maxBuffer,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../src/native/workspace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAItC,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE9F,MAAM,QAAQ,GAAG,SAAS,CAAC,gBAAgB,CAAC,CAAC;AAC7C,MAAM,mBAAmB,GAAG,CAAC,GAAG,oBAAoB,CAAC;AACrD,MAAM,cAAc,GAAG,sCAAsC,CAAC;AAE9D,KAAK,UAAU,GAAG,CAAC,GAAW,EAAE,IAAc,EAAE,SAAS,GAAG,oBAAoB;IAC9E,IAAI,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,QAAQ,CAC/B,KAAK,EACL;YACE,qBAAqB;YACrB,qBAAqB;YACrB,IAAI;YACJ,sBAAsB;YACtB,IAAI;YACJ,sBAAsB;YACtB,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../src/native/workspace.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"branch-update.d.ts","sourceRoot":"","sources":["../../src/task-init/branch-update.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"branch-update.d.ts","sourceRoot":"","sources":["../../src/task-init/branch-update.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAIrE,MAAM,WAAW,wBAAwB;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,0BAA0B,CAAC,MAAM,CAAC,CAAC;IACzC,SAAS,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,iBAAiB,EAAE,MAAM,CAAC;QAAC,iBAAiB,EAAE,MAAM,CAAA;KAAE,CAAC;IACrF,kBAAkB,CAAC,EAAE,0BAA0B,CAAC,oBAAoB,CAAC,CAAC;IACtE,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,gCAAgC;IAC/C,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAsBD,qBAAa,wBAAyB,SAAQ,KAAK;aAE/B,IAAI,EAAE,MAAM;gBAAZ,IAAI,EAAE,MAAM,EAC5B,KAAK,CAAC,EAAE,OAAO;CAIlB;AAUD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEhE;AAqDD,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,wBAAwB,GAChC,0BAA0B,CA6B5B;AA0ND,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,0BAA0B,GAAG,MAAM,CA2DtF;AAED,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,0BAA0B,GAAG,IAAI,CAwCjF;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,0BAA0B,GAAG;IAC9E,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CA8BA;AAED,MAAM,WAAW,2BAA2B;IAC1C,MAAM,EAAE,SAAS,GAAG,QAAQ,GAAG,OAAO,CAAC;IACvC,MAAM,CAAC,EAAE,gBAAgB,GAAG,sBAAsB,GAAG,mBAAmB,CAAC;CAC1E;AAED,kFAAkF;AAClF,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,0BAA0B,GACpC,2BAA2B,CAwB7B;AAED,MAAM,WAAW,2BAA2B;IAC1C,MAAM,EAAE,SAAS,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAsCD,yFAAyF;AACzF,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,0BAA0B,EACrC,YAAY,UAAQ,GACnB,2BAA2B,CAqL7B;AAWD,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,gCAAgC,GACxC,MAAM,CA2DR;AAED,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,gCAAgC,GAAG,IAAI,CAO7F"}
|
|
@@ -2,6 +2,7 @@ import { execFileSync } from 'node:child_process';
|
|
|
2
2
|
import { createHash } from 'node:crypto';
|
|
3
3
|
import { closeSync, existsSync, fsyncSync, openSync, readFileSync, renameSync, writeFileSync, } from 'node:fs';
|
|
4
4
|
import path from 'node:path';
|
|
5
|
+
import { gitDiffArgs } from '../../scripts/git-diff.cjs';
|
|
5
6
|
export class BranchMaintenanceRefusal extends Error {
|
|
6
7
|
constructor(code, cause) {
|
|
7
8
|
super(`Branch maintenance refused: ${code}`, { cause });
|
|
@@ -18,7 +19,7 @@ export function normalizeMaintenanceBranch(value) {
|
|
|
18
19
|
return value.replace(/^(?:refs\/remotes\/origin\/|refs\/heads\/|origin\/)/, '');
|
|
19
20
|
}
|
|
20
21
|
function git(repo, args, input, authorEnv) {
|
|
21
|
-
return execFileSync('git', args, {
|
|
22
|
+
return execFileSync('git', args[0] === 'diff' ? gitDiffArgs(args.slice(1)) : args, {
|
|
22
23
|
cwd: repo,
|
|
23
24
|
...(authorEnv ? { env: { ...process.env, ...authorEnv } } : {}),
|
|
24
25
|
encoding: 'utf8',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"branch-update.js","sourceRoot":"","sources":["../../src/task-init/branch-update.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"branch-update.js","sourceRoot":"","sources":["../../src/task-init/branch-update.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@farmslot/agent-runtime",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.23.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -36,6 +36,10 @@
|
|
|
36
36
|
"import": "./dist/native/*.js"
|
|
37
37
|
},
|
|
38
38
|
"./scripts/branch-update.mjs": "./scripts/branch-update.mjs",
|
|
39
|
+
"./scripts/git-diff.cjs": {
|
|
40
|
+
"types": "./scripts/git-diff.d.cts",
|
|
41
|
+
"default": "./scripts/git-diff.cjs"
|
|
42
|
+
},
|
|
39
43
|
"./scripts/review-diff-scope.cjs": {
|
|
40
44
|
"types": "./scripts/review-diff-scope.d.cts",
|
|
41
45
|
"default": "./scripts/review-diff-scope.cjs"
|
|
@@ -56,8 +60,8 @@
|
|
|
56
60
|
"test:branch-maintenance-live": "node --import tsx --test test/branch-maintenance-live.mts"
|
|
57
61
|
},
|
|
58
62
|
"dependencies": {
|
|
59
|
-
"@farmslot/adapter-sdk": "0.14.
|
|
60
|
-
"@farmslot/protocol": "0.
|
|
63
|
+
"@farmslot/adapter-sdk": "0.14.1",
|
|
64
|
+
"@farmslot/protocol": "0.46.0"
|
|
61
65
|
},
|
|
62
66
|
"devDependencies": {
|
|
63
67
|
"@types/node": "^22.0.0",
|
|
@@ -96,6 +100,7 @@
|
|
|
96
100
|
"scripts/**/*.mjs",
|
|
97
101
|
"scripts/retained-recipe-attempt.d.cts",
|
|
98
102
|
"scripts/execution-template-cli.mjs",
|
|
103
|
+
"scripts/git-diff.d.cts",
|
|
99
104
|
"scripts/review-diff-scope.d.cts"
|
|
100
105
|
],
|
|
101
106
|
"publishConfig": {
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
// Runtime diff views and fingerprints share one formatting policy. Range,
|
|
4
|
+
// pathspec, binary and summary flags remain with the owning caller.
|
|
5
|
+
const GIT_DIFF_ARGS = Object.freeze([
|
|
6
|
+
'-c',
|
|
7
|
+
'core.quotePath=false',
|
|
8
|
+
'-c',
|
|
9
|
+
'diff.mnemonicPrefix=false',
|
|
10
|
+
'-c',
|
|
11
|
+
'diff.noprefix=false',
|
|
12
|
+
'-c',
|
|
13
|
+
'diff.suppressBlankEmpty=false',
|
|
14
|
+
'-c',
|
|
15
|
+
'diff.orderFile=/dev/null',
|
|
16
|
+
'-c',
|
|
17
|
+
'diff.context=3',
|
|
18
|
+
'diff',
|
|
19
|
+
'--src-prefix=a/',
|
|
20
|
+
'--dst-prefix=b/',
|
|
21
|
+
'--no-color',
|
|
22
|
+
'--no-ext-diff',
|
|
23
|
+
'--no-textconv',
|
|
24
|
+
'--no-relative',
|
|
25
|
+
'--inter-hunk-context=0',
|
|
26
|
+
'--diff-algorithm=myers',
|
|
27
|
+
'--indent-heuristic',
|
|
28
|
+
'--find-renames=50%',
|
|
29
|
+
'-l1000',
|
|
30
|
+
'--submodule=short',
|
|
31
|
+
'--ignore-submodules=none',
|
|
32
|
+
'--output-indicator-new=+',
|
|
33
|
+
'--output-indicator-old=-',
|
|
34
|
+
'--output-indicator-context= ',
|
|
35
|
+
]);
|
|
36
|
+
|
|
37
|
+
const GIT_DIFF_COMMAND = `git ${GIT_DIFF_ARGS.map((arg) => (arg.includes(' ') ? `'${arg}'` : arg)).join(' ')}`;
|
|
38
|
+
|
|
39
|
+
function gitDiffArgs(args = []) {
|
|
40
|
+
return [...GIT_DIFF_ARGS, ...args];
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
module.exports = { GIT_DIFF_ARGS, GIT_DIFF_COMMAND, gitDiffArgs };
|