@yadsh/dsh-git-readonly 0.2.0 → 0.2.1
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/compatibility.json +2 -6
- package/lib/config.d.ts +1 -1
- package/lib/config.d.ts.map +1 -1
- package/lib/config.js +22 -19
- package/lib/config.js.map +1 -1
- package/lib/errors.d.ts +1 -1
- package/lib/errors.js +1 -1
- package/lib/git/env.d.ts.map +1 -1
- package/lib/git/env.js +23 -23
- package/lib/git/env.js.map +1 -1
- package/lib/git/format.d.ts.map +1 -1
- package/lib/git/format.js +41 -31
- package/lib/git/format.js.map +1 -1
- package/lib/git/repo.d.ts +3 -3
- package/lib/git/repo.d.ts.map +1 -1
- package/lib/git/repo.js +37 -30
- package/lib/git/repo.js.map +1 -1
- package/lib/git/runner.d.ts.map +1 -1
- package/lib/git/runner.js +22 -22
- package/lib/git/runner.js.map +1 -1
- package/lib/git/validate.d.ts.map +1 -1
- package/lib/git/validate.js +34 -34
- package/lib/git/validate.js.map +1 -1
- package/lib/index.d.ts +15 -15
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +27 -27
- package/lib/index.js.map +1 -1
- package/lib/tools/blame.d.ts +2 -2
- package/lib/tools/blame.d.ts.map +1 -1
- package/lib/tools/blame.js +60 -54
- package/lib/tools/blame.js.map +1 -1
- package/lib/tools/context.d.ts +1 -1
- package/lib/tools/context.d.ts.map +1 -1
- package/lib/tools/context.js +45 -43
- package/lib/tools/context.js.map +1 -1
- package/lib/tools/history.d.ts +1 -1
- package/lib/tools/history.d.ts.map +1 -1
- package/lib/tools/history.js +92 -78
- package/lib/tools/history.js.map +1 -1
- package/lib/tools/shared.d.ts +5 -5
- package/lib/tools/shared.d.ts.map +1 -1
- package/lib/tools/shared.js +14 -14
- package/lib/tools/shared.js.map +1 -1
- package/lib/tools/show.d.ts +2 -2
- package/lib/tools/show.d.ts.map +1 -1
- package/lib/tools/show.js +86 -63
- package/lib/tools/show.js.map +1 -1
- package/package.json +4 -4
package/compatibility.json
CHANGED
|
@@ -2,12 +2,8 @@
|
|
|
2
2
|
"deepseekHarness": {
|
|
3
3
|
"channel": "next",
|
|
4
4
|
"range": ">=0.1.5-rc.2 <0.2.0",
|
|
5
|
-
"testedReleases": [
|
|
6
|
-
|
|
7
|
-
],
|
|
8
|
-
"requiredHostFeatures": [
|
|
9
|
-
"tools/register"
|
|
10
|
-
]
|
|
5
|
+
"testedReleases": ["0.1.5-rc.2"],
|
|
6
|
+
"requiredHostFeatures": ["tools/register"]
|
|
11
7
|
},
|
|
12
8
|
"node": "^22.19.0 || >=24.0.0"
|
|
13
9
|
}
|
package/lib/config.d.ts
CHANGED
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
* clamped values, so the tools never deal with optional fields or unsafe
|
|
8
8
|
* limits. Every field is documented — this is the deployment contract.
|
|
9
9
|
*/
|
|
10
|
-
import z from
|
|
10
|
+
import z from "@deepseek-ai/schemastery";
|
|
11
11
|
/** Raw user-facing configuration. */
|
|
12
12
|
export interface GitReadonlyConfig {
|
|
13
13
|
/** Master switch; when false the tools are not registered at all. */
|
package/lib/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,CAAC,MAAM,0BAA0B,CAAC;AAEzC,qCAAqC;AACrC,MAAM,WAAW,iBAAiB;IAChC,qEAAqE;IACrE,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B;;;OAGG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B;;;OAGG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IACpC,2EAA2E;IAC3E,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,OAAO,CAAC,EAAE;QACjB,sEAAsE;QACtE,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;QAC/B,6DAA6D;QAC7D,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;KAC5B,CAAC;IACF,QAAQ,CAAC,KAAK,CAAC,EAAE;QACf,8DAA8D;QAC9D,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;KAC5B,CAAC;IACF,4EAA4E;IAC5E,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,gEAAgE;AAChE,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,eAAO,MAAM,qBAAqB,EAAE,yBASnC,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,CAAC,MAAM,0BAA0B,CAAC;AAEzC,qCAAqC;AACrC,MAAM,WAAW,iBAAiB;IAChC,qEAAqE;IACrE,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B;;;OAGG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B;;;OAGG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IACpC,2EAA2E;IAC3E,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,OAAO,CAAC,EAAE;QACjB,sEAAsE;QACtE,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;QAC/B,6DAA6D;QAC7D,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;KAC5B,CAAC;IACF,QAAQ,CAAC,KAAK,CAAC,EAAE;QACf,8DAA8D;QAC9D,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;KAC5B,CAAC;IACF,4EAA4E;IAC5E,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,gEAAgE;AAChE,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,eAAO,MAAM,qBAAqB,EAAE,yBASnC,CAAC;AAYF,eAAO,MAAM,uBAAuB,EAAE,CAAC,CAAC,iBAAiB,CAmDR,CAAC;AAElD,qEAAqE;AACrE,wBAAgB,wBAAwB,CACtC,GAAG,CAAC,EAAE,iBAAiB,GAAG,OAAO,GAChC,yBAAyB,CAoD3B"}
|
package/lib/config.js
CHANGED
|
@@ -7,11 +7,11 @@
|
|
|
7
7
|
* clamped values, so the tools never deal with optional fields or unsafe
|
|
8
8
|
* limits. Every field is documented — this is the deployment contract.
|
|
9
9
|
*/
|
|
10
|
-
import path from
|
|
11
|
-
import z from
|
|
10
|
+
import path from "node:path";
|
|
11
|
+
import z from "@deepseek-ai/schemastery";
|
|
12
12
|
export const GIT_READONLY_DEFAULTS = {
|
|
13
13
|
enabled: true,
|
|
14
|
-
gitPath:
|
|
14
|
+
gitPath: "git",
|
|
15
15
|
repositoryRoots: [],
|
|
16
16
|
timeoutMs: 15_000,
|
|
17
17
|
historyDefaultLimit: 20,
|
|
@@ -20,65 +20,68 @@ export const GIT_READONLY_DEFAULTS = {
|
|
|
20
20
|
patchBytes: 200_000,
|
|
21
21
|
};
|
|
22
22
|
function clampInteger(value, min, max, fallback) {
|
|
23
|
-
if (typeof value !==
|
|
23
|
+
if (typeof value !== "number" || !Number.isFinite(value))
|
|
24
24
|
return fallback;
|
|
25
25
|
return Math.min(max, Math.max(min, Math.floor(value)));
|
|
26
26
|
}
|
|
27
27
|
export const GitReadonlyConfigSchema = z
|
|
28
28
|
.object({
|
|
29
|
-
enabled: z
|
|
29
|
+
enabled: z
|
|
30
|
+
.boolean()
|
|
31
|
+
.default(true)
|
|
32
|
+
.description("Register the read-only git tools."),
|
|
30
33
|
gitPath: z
|
|
31
34
|
.string()
|
|
32
|
-
.default(
|
|
33
|
-
.description(
|
|
35
|
+
.default("git")
|
|
36
|
+
.description("Git executable used for the read-only inspections."),
|
|
34
37
|
repositoryRoots: z
|
|
35
38
|
.array(z.string())
|
|
36
39
|
.default([])
|
|
37
|
-
.description(
|
|
40
|
+
.description("Absolute directory roots that tools may select with the repository argument."),
|
|
38
41
|
timeoutMs: z
|
|
39
42
|
.number()
|
|
40
43
|
.default(GIT_READONLY_DEFAULTS.timeoutMs)
|
|
41
|
-
.description(
|
|
44
|
+
.description("Wall-clock budget per git invocation in milliseconds (1000-30000)."),
|
|
42
45
|
history: z
|
|
43
46
|
.object({
|
|
44
47
|
defaultLimit: z
|
|
45
48
|
.number()
|
|
46
49
|
.default(GIT_READONLY_DEFAULTS.historyDefaultLimit)
|
|
47
|
-
.description(
|
|
50
|
+
.description("History page size when the model omits limit (1-50)."),
|
|
48
51
|
maxLimit: z
|
|
49
52
|
.number()
|
|
50
53
|
.default(GIT_READONLY_DEFAULTS.historyMaxLimit)
|
|
51
|
-
.description(
|
|
54
|
+
.description("Hard upper bound for one history page (1-200)."),
|
|
52
55
|
})
|
|
53
|
-
.description(
|
|
56
|
+
.description("Limits for dsh_git_history."),
|
|
54
57
|
blame: z
|
|
55
58
|
.object({
|
|
56
59
|
maxLines: z
|
|
57
60
|
.number()
|
|
58
61
|
.default(GIT_READONLY_DEFAULTS.blameMaxLines)
|
|
59
|
-
.description(
|
|
62
|
+
.description("Maximum lines attributed by one dsh_git_blame call (1-1000)."),
|
|
60
63
|
})
|
|
61
|
-
.description(
|
|
64
|
+
.description("Limits for dsh_git_blame."),
|
|
62
65
|
patchBytes: z
|
|
63
66
|
.number()
|
|
64
67
|
.default(GIT_READONLY_DEFAULTS.patchBytes)
|
|
65
|
-
.description(
|
|
68
|
+
.description("Maximum patch bytes returned by dsh_git_show (4096-1048576)."),
|
|
66
69
|
})
|
|
67
|
-
.description(
|
|
70
|
+
.description("Read-only git provenance tools.");
|
|
68
71
|
/** Normalize and clamp raw configuration into the resolved shape. */
|
|
69
72
|
export function resolveGitReadonlyConfig(raw) {
|
|
70
73
|
const config = (raw ?? {});
|
|
71
74
|
const repositoryRoots = [
|
|
72
75
|
...new Set((config.repositoryRoots ?? [])
|
|
73
76
|
.map((value) => value.trim())
|
|
74
|
-
.filter((value) => value !==
|
|
77
|
+
.filter((value) => value !== "")),
|
|
75
78
|
];
|
|
76
79
|
if (repositoryRoots.some((value) => !path.isAbsolute(value))) {
|
|
77
|
-
throw new TypeError(
|
|
80
|
+
throw new TypeError("dsh-git-readonly: repositoryRoots must contain only absolute paths");
|
|
78
81
|
}
|
|
79
82
|
return {
|
|
80
83
|
enabled: config.enabled ?? GIT_READONLY_DEFAULTS.enabled,
|
|
81
|
-
gitPath: typeof config.gitPath ===
|
|
84
|
+
gitPath: typeof config.gitPath === "string" && config.gitPath.trim() !== ""
|
|
82
85
|
? config.gitPath.trim()
|
|
83
86
|
: GIT_READONLY_DEFAULTS.gitPath,
|
|
84
87
|
repositoryRoots,
|
package/lib/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,CAAC,MAAM,0BAA0B,CAAC;AA4CzC,MAAM,CAAC,MAAM,qBAAqB,GAA8B;IAC9D,OAAO,EAAE,IAAI;IACb,OAAO,EAAE,KAAK;IACd,eAAe,EAAE,EAAE;IACnB,SAAS,EAAE,MAAM;IACjB,mBAAmB,EAAE,EAAE;IACvB,eAAe,EAAE,GAAG;IACpB,aAAa,EAAE,GAAG;IAClB,UAAU,EAAE,OAAO;CACpB,CAAC;AAEF,SAAS,YAAY,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
package/lib/errors.d.ts
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* `code`; the message is the human-facing explanation. Codes are never
|
|
6
6
|
* reused for a different meaning.
|
|
7
7
|
*/
|
|
8
|
-
export type GitToolErrorCode =
|
|
8
|
+
export type GitToolErrorCode = "no-session-cwd" | "not-a-git-repository" | "invalid-repository" | "repository-not-allowed" | "invalid-oid" | "invalid-path" | "invalid-argument" | "git-timeout" | "git-failed";
|
|
9
9
|
export declare class GitToolError extends Error {
|
|
10
10
|
readonly code: GitToolErrorCode;
|
|
11
11
|
constructor(code: GitToolErrorCode, message: string);
|
package/lib/errors.js
CHANGED
package/lib/git/env.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/git/env.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,eAAO,MAAM,gBAAgB,EAAE,SAAS,MAAM,EAkB7C,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAO9D,CAAC;AAEF,gFAAgF;AAChF,wBAAgB,WAAW,
|
|
1
|
+
{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/git/env.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,eAAO,MAAM,gBAAgB,EAAE,SAAS,MAAM,EAkB7C,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAO9D,CAAC;AAEF,gFAAgF;AAChF,wBAAgB,WAAW,CACzB,IAAI,GAAE,MAAM,CAAC,UAAwB,GACpC,MAAM,CAAC,UAAU,CASnB"}
|
package/lib/git/env.js
CHANGED
|
@@ -7,23 +7,23 @@
|
|
|
7
7
|
* the hardening CLI flags neutralize; this list closes the ambient half.
|
|
8
8
|
*/
|
|
9
9
|
export const REMOVED_ENV_KEYS = [
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
10
|
+
"GIT_DIR",
|
|
11
|
+
"GIT_WORK_TREE",
|
|
12
|
+
"GIT_INDEX_FILE",
|
|
13
|
+
"GIT_OBJECT_DIRECTORY",
|
|
14
|
+
"GIT_ALTERNATE_OBJECT_DIRECTORIES",
|
|
15
|
+
"GIT_NAMESPACE",
|
|
16
|
+
"GIT_EXTERNAL_DIFF",
|
|
17
|
+
"GIT_DIFF_OPTS",
|
|
18
|
+
"GIT_CONFIG_COUNT",
|
|
19
|
+
"GIT_CONFIG_PARAMETERS",
|
|
20
|
+
"GIT_CONFIG_SYSTEM",
|
|
21
|
+
"GIT_CONFIG_GLOBAL",
|
|
22
|
+
"GIT_ASKPASS",
|
|
23
|
+
"GIT_SSH",
|
|
24
|
+
"GIT_SSH_COMMAND",
|
|
25
|
+
"GIT_PROXY_COMMAND",
|
|
26
|
+
"GIT_PAGER",
|
|
27
27
|
];
|
|
28
28
|
/**
|
|
29
29
|
* Hardened values forced on top of the (filtered) parent environment.
|
|
@@ -37,12 +37,12 @@ export const REMOVED_ENV_KEYS = [
|
|
|
37
37
|
* output regardless of the host locale.
|
|
38
38
|
*/
|
|
39
39
|
export const FORCED_ENV_VALUES = {
|
|
40
|
-
LC_ALL:
|
|
41
|
-
GIT_OPTIONAL_LOCKS:
|
|
42
|
-
GIT_TERMINAL_PROMPT:
|
|
43
|
-
GIT_CONFIG_NOSYSTEM:
|
|
44
|
-
GIT_PAGER:
|
|
45
|
-
PAGER:
|
|
40
|
+
LC_ALL: "C",
|
|
41
|
+
GIT_OPTIONAL_LOCKS: "0",
|
|
42
|
+
GIT_TERMINAL_PROMPT: "0",
|
|
43
|
+
GIT_CONFIG_NOSYSTEM: "1",
|
|
44
|
+
GIT_PAGER: "cat",
|
|
45
|
+
PAGER: "cat",
|
|
46
46
|
};
|
|
47
47
|
/** Build the environment for one git invocation from the parent environment. */
|
|
48
48
|
export function buildGitEnv(base = process.env) {
|
package/lib/git/env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/git/env.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAsB;IACjD,SAAS;IACT,eAAe;IACf,gBAAgB;IAChB,sBAAsB;IACtB,kCAAkC;IAClC,eAAe;IACf,mBAAmB;IACnB,eAAe;IACf,kBAAkB;IAClB,uBAAuB;IACvB,mBAAmB;IACnB,mBAAmB;IACnB,aAAa;IACb,SAAS;IACT,iBAAiB;IACjB,mBAAmB;IACnB,WAAW;CACZ,CAAC;AAEF;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAqC;IACjE,MAAM,EAAE,GAAG;IACX,kBAAkB,EAAE,GAAG;IACvB,mBAAmB,EAAE,GAAG;IACxB,mBAAmB,EAAE,GAAG;IACxB,SAAS,EAAE,KAAK;IAChB,KAAK,EAAE,KAAK;CACb,CAAC;AAEF,gFAAgF;AAChF,MAAM,UAAU,WAAW,
|
|
1
|
+
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/git/env.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAsB;IACjD,SAAS;IACT,eAAe;IACf,gBAAgB;IAChB,sBAAsB;IACtB,kCAAkC;IAClC,eAAe;IACf,mBAAmB;IACnB,eAAe;IACf,kBAAkB;IAClB,uBAAuB;IACvB,mBAAmB;IACnB,mBAAmB;IACnB,aAAa;IACb,SAAS;IACT,iBAAiB;IACjB,mBAAmB;IACnB,WAAW;CACZ,CAAC;AAEF;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAqC;IACjE,MAAM,EAAE,GAAG;IACX,kBAAkB,EAAE,GAAG;IACvB,mBAAmB,EAAE,GAAG;IACxB,mBAAmB,EAAE,GAAG;IACxB,SAAS,EAAE,KAAK;IAChB,KAAK,EAAE,KAAK;CACb,CAAC;AAEF,gFAAgF;AAChF,MAAM,UAAU,WAAW,CACzB,IAAI,GAAsB,OAAO,CAAC,GAAG;IAErC,MAAM,OAAO,GAAG,IAAI,GAAG,CAAS,gBAAgB,CAAC,CAAC;IAClD,MAAM,GAAG,GAAsB,EAAE,CAAC;IAClC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QAChD,IAAI,KAAK,KAAK,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,SAAS;QACtD,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACnB,CAAC;IACD,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;IACtC,OAAO,GAAG,CAAC;AACb,CAAC"}
|
package/lib/git/format.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../src/git/format.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,eAAO,MAAM,QAAQ,WAAS,CAAC;AAE/B,qEAAqE;AACrE,eAAO,MAAM,cAAc,
|
|
1
|
+
{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../src/git/format.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,eAAO,MAAM,QAAQ,WAAS,CAAC;AAE/B,qEAAqE;AACrE,eAAO,MAAM,cAAc,QAE1B,CAAC;AAEF,uEAAuE;AACvE,eAAO,MAAM,gBAAgB,QAQb,CAAC;AAEjB;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,GACjB,MAAM,EAAE,CAWV;AAED,mFAAmF;AACnF,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,CAc9D;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,oDAAoD;IACpD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,0DAA0D;AAC1D,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,EAAE,CAmB1D;AAED,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,kDAAkD;IAClD,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,sEAAsE;IACtE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,CAqD/D"}
|
package/lib/git/format.js
CHANGED
|
@@ -6,11 +6,19 @@
|
|
|
6
6
|
* The final field of a template absorbs any separator characters that
|
|
7
7
|
* appear inside it (e.g. newlines in a commit body).
|
|
8
8
|
*/
|
|
9
|
-
export const UNIT_SEP =
|
|
9
|
+
export const UNIT_SEP = "\x1f";
|
|
10
10
|
/** oid, shortOid, author, authoredAt (ISO), subject, decorations. */
|
|
11
|
-
export const HISTORY_FORMAT = [
|
|
11
|
+
export const HISTORY_FORMAT = ["%H", "%h", "%an", "%aI", "%s", "%d"].join(UNIT_SEP);
|
|
12
12
|
/** oid, shortOid, author, authoredAt (ISO), subject, parents, body. */
|
|
13
|
-
export const SHOW_META_FORMAT = [
|
|
13
|
+
export const SHOW_META_FORMAT = [
|
|
14
|
+
"%H",
|
|
15
|
+
"%h",
|
|
16
|
+
"%an",
|
|
17
|
+
"%aI",
|
|
18
|
+
"%s",
|
|
19
|
+
"%P",
|
|
20
|
+
"%b",
|
|
21
|
+
].join(UNIT_SEP);
|
|
14
22
|
/**
|
|
15
23
|
* Split one `--format` record. Fields before `fixedCount` must not contain
|
|
16
24
|
* the separator; the last field is the remainder of the record.
|
|
@@ -20,8 +28,8 @@ export function parseFormatRecord(record, fixedCount) {
|
|
|
20
28
|
if (parts.length <= fixedCount) {
|
|
21
29
|
const padded = [...parts];
|
|
22
30
|
while (padded.length < fixedCount)
|
|
23
|
-
padded.push(
|
|
24
|
-
padded.push(
|
|
31
|
+
padded.push("");
|
|
32
|
+
padded.push("");
|
|
25
33
|
return padded;
|
|
26
34
|
}
|
|
27
35
|
const head = parts.slice(0, fixedCount);
|
|
@@ -31,26 +39,28 @@ export function parseFormatRecord(record, fixedCount) {
|
|
|
31
39
|
/** Parse a `%d` decoration string into ref entries (without parens/tag prefix). */
|
|
32
40
|
export function parseDecorations(decorations) {
|
|
33
41
|
const trimmed = decorations.trim();
|
|
34
|
-
if (trimmed ===
|
|
42
|
+
if (trimmed === "")
|
|
35
43
|
return [];
|
|
36
|
-
const inner = trimmed.startsWith(
|
|
44
|
+
const inner = trimmed.startsWith("(") && trimmed.endsWith(")")
|
|
45
|
+
? trimmed.slice(1, -1)
|
|
46
|
+
: trimmed;
|
|
37
47
|
return inner
|
|
38
|
-
.split(
|
|
48
|
+
.split(",")
|
|
39
49
|
.map((entry) => entry.trim())
|
|
40
|
-
.filter((entry) => entry !==
|
|
41
|
-
.map((entry) =>
|
|
50
|
+
.filter((entry) => entry !== "")
|
|
51
|
+
.map((entry) => entry.startsWith("tag: ") ? entry.slice("tag: ".length) : entry);
|
|
42
52
|
}
|
|
43
53
|
/** Parse `--numstat` output into structured file rows. */
|
|
44
54
|
export function parseNumstat(stdout) {
|
|
45
55
|
const files = [];
|
|
46
|
-
for (const line of stdout.split(
|
|
47
|
-
const trimmed = line.replace(/\r$/,
|
|
48
|
-
if (trimmed ===
|
|
56
|
+
for (const line of stdout.split("\n")) {
|
|
57
|
+
const trimmed = line.replace(/\r$/, "");
|
|
58
|
+
if (trimmed === "")
|
|
49
59
|
continue;
|
|
50
|
-
const tabIndex1 = trimmed.indexOf(
|
|
60
|
+
const tabIndex1 = trimmed.indexOf("\t");
|
|
51
61
|
if (tabIndex1 < 0)
|
|
52
62
|
continue;
|
|
53
|
-
const tabIndex2 = trimmed.indexOf(
|
|
63
|
+
const tabIndex2 = trimmed.indexOf("\t", tabIndex1 + 1);
|
|
54
64
|
if (tabIndex2 < 0)
|
|
55
65
|
continue;
|
|
56
66
|
const additions = trimmed.slice(0, tabIndex1);
|
|
@@ -58,8 +68,8 @@ export function parseNumstat(stdout) {
|
|
|
58
68
|
const path = trimmed.slice(tabIndex2 + 1);
|
|
59
69
|
files.push({
|
|
60
70
|
path,
|
|
61
|
-
additions: additions ===
|
|
62
|
-
deletions: deletions ===
|
|
71
|
+
additions: additions === "-" ? undefined : Number.parseInt(additions, 10),
|
|
72
|
+
deletions: deletions === "-" ? undefined : Number.parseInt(deletions, 10),
|
|
63
73
|
});
|
|
64
74
|
}
|
|
65
75
|
return files;
|
|
@@ -75,23 +85,23 @@ export function parsePorcelainBlame(stdout) {
|
|
|
75
85
|
const lines = [];
|
|
76
86
|
const commitMeta = new Map();
|
|
77
87
|
let current;
|
|
78
|
-
for (const rawLine of stdout.split(
|
|
79
|
-
const line = rawLine.replace(/\r$/,
|
|
80
|
-
if (line.startsWith(
|
|
88
|
+
for (const rawLine of stdout.split("\n")) {
|
|
89
|
+
const line = rawLine.replace(/\r$/, "");
|
|
90
|
+
if (line.startsWith("\t")) {
|
|
81
91
|
if (current === undefined)
|
|
82
92
|
continue;
|
|
83
93
|
const meta = commitMeta.get(current.oid);
|
|
84
94
|
lines.push({
|
|
85
95
|
line: current.finalLine,
|
|
86
96
|
oid: current.oid,
|
|
87
|
-
author: meta?.author ??
|
|
88
|
-
authoredAt: meta?.authoredAt ??
|
|
89
|
-
summary: meta?.summary ??
|
|
97
|
+
author: meta?.author ?? "",
|
|
98
|
+
authoredAt: meta?.authoredAt ?? "",
|
|
99
|
+
summary: meta?.summary ?? "",
|
|
90
100
|
content: line.slice(1),
|
|
91
101
|
});
|
|
92
102
|
continue;
|
|
93
103
|
}
|
|
94
|
-
if (line ===
|
|
104
|
+
if (line === "")
|
|
95
105
|
continue;
|
|
96
106
|
const match = /^([0-9a-f]{40,64}) (\d+) (\d+)(?: \d+)?$/.exec(line);
|
|
97
107
|
if (match) {
|
|
@@ -99,7 +109,7 @@ export function parsePorcelainBlame(stdout) {
|
|
|
99
109
|
const finalLine = Number.parseInt(match[3], 10);
|
|
100
110
|
current = { oid, finalLine };
|
|
101
111
|
if (!commitMeta.has(oid)) {
|
|
102
|
-
commitMeta.set(oid, { author:
|
|
112
|
+
commitMeta.set(oid, { author: "", authoredAt: "", summary: "" });
|
|
103
113
|
}
|
|
104
114
|
continue;
|
|
105
115
|
}
|
|
@@ -108,17 +118,17 @@ export function parsePorcelainBlame(stdout) {
|
|
|
108
118
|
const meta = commitMeta.get(current.oid);
|
|
109
119
|
if (meta === undefined)
|
|
110
120
|
continue;
|
|
111
|
-
if (line.startsWith(
|
|
112
|
-
meta.author = line.slice(
|
|
121
|
+
if (line.startsWith("author ")) {
|
|
122
|
+
meta.author = line.slice("author ".length);
|
|
113
123
|
}
|
|
114
|
-
else if (line.startsWith(
|
|
115
|
-
const epoch = Number.parseInt(line.slice(
|
|
124
|
+
else if (line.startsWith("author-time ")) {
|
|
125
|
+
const epoch = Number.parseInt(line.slice("author-time ".length), 10);
|
|
116
126
|
if (Number.isFinite(epoch)) {
|
|
117
127
|
meta.authoredAt = new Date(epoch * 1000).toISOString();
|
|
118
128
|
}
|
|
119
129
|
}
|
|
120
|
-
else if (line.startsWith(
|
|
121
|
-
meta.summary = line.slice(
|
|
130
|
+
else if (line.startsWith("summary ")) {
|
|
131
|
+
meta.summary = line.slice("summary ".length);
|
|
122
132
|
}
|
|
123
133
|
}
|
|
124
134
|
return lines;
|
package/lib/git/format.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/git/format.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC;AAE/B,qEAAqE;AACrE,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/git/format.ts"],"names":[],"mappings":"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"}
|
package/lib/git/repo.d.ts
CHANGED
|
@@ -6,10 +6,10 @@
|
|
|
6
6
|
* fallback to the host process cwd — a session without a pinned cwd fails
|
|
7
7
|
* closed instead of silently gaining git access to wherever the harness runs.
|
|
8
8
|
*/
|
|
9
|
-
import type { ToolRunContext } from
|
|
10
|
-
import type { GitRunResult } from
|
|
9
|
+
import type { ToolRunContext } from "@deepseek-ai/dsh-tools";
|
|
10
|
+
import type { GitRunResult } from "./runner.js";
|
|
11
11
|
/** Execution context handed to tool bodies (structural subset for tests). */
|
|
12
|
-
export type ToolExec = Pick<ToolRunContext,
|
|
12
|
+
export type ToolExec = Pick<ToolRunContext, "agent">;
|
|
13
13
|
/** Runner bound by the tools: argv + working directory in, git result out. */
|
|
14
14
|
export type GitRunner = (argv: readonly string[], options: {
|
|
15
15
|
readonly cwd: string;
|
package/lib/git/repo.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repo.d.ts","sourceRoot":"","sources":["../../src/git/repo.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAI7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,6EAA6E;AAC7E,MAAM,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;AAErD,8EAA8E;AAC9E,MAAM,MAAM,SAAS,GAAG,CACtB,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,EAAE;
|
|
1
|
+
{"version":3,"file":"repo.d.ts","sourceRoot":"","sources":["../../src/git/repo.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAI7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,6EAA6E;AAC7E,MAAM,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;AAErD,8EAA8E;AAC9E,MAAM,MAAM,SAAS,GAAG,CACtB,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,EAAE;IACP,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B,KACE,OAAO,CAAC,YAAY,CAAC,CAAC;AAE3B,uEAAuE;AACvE,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,CAgBxD;AAED,0EAA0E;AAC1E,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,SAAS,EACd,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GAC7B,OAAO,CAAC,MAAM,CAAC,CAejB;AA6BD;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,SAAS,EACd,IAAI,EAAE,QAAQ,EACd,SAAS,EAAE,OAAO,EAClB,OAAO,EAAE;IACP,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;CAC7C,GACA,OAAO,CAAC,MAAM,CAAC,CAyEjB;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,SAAS,EACd,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GAC7B,OAAO,CAAC,MAAM,CAAC,CAiBjB"}
|
package/lib/git/repo.js
CHANGED
|
@@ -6,50 +6,52 @@
|
|
|
6
6
|
* fallback to the host process cwd — a session without a pinned cwd fails
|
|
7
7
|
* closed instead of silently gaining git access to wherever the harness runs.
|
|
8
8
|
*/
|
|
9
|
-
import { realpath, stat } from
|
|
10
|
-
import path from
|
|
11
|
-
import { GitToolError } from
|
|
12
|
-
import { FULL_OID_PATTERN } from
|
|
9
|
+
import { realpath, stat } from "node:fs/promises";
|
|
10
|
+
import path from "node:path";
|
|
11
|
+
import { GitToolError } from "../errors.js";
|
|
12
|
+
import { FULL_OID_PATTERN } from "./validate.js";
|
|
13
13
|
/** Extract the calling session's working directory, failing closed. */
|
|
14
14
|
export function requireSessionCwd(exec) {
|
|
15
15
|
const agent = exec.agent;
|
|
16
16
|
if (agent === undefined) {
|
|
17
|
-
throw new GitToolError(
|
|
17
|
+
throw new GitToolError("no-session-cwd", "this tool requires a calling agent session");
|
|
18
18
|
}
|
|
19
19
|
const cwd = agent.session.header.cwd;
|
|
20
|
-
if (typeof cwd !==
|
|
21
|
-
throw new GitToolError(
|
|
20
|
+
if (typeof cwd !== "string" || cwd.trim() === "") {
|
|
21
|
+
throw new GitToolError("no-session-cwd", "this session has no working directory; git inspection is not available");
|
|
22
22
|
}
|
|
23
23
|
return cwd;
|
|
24
24
|
}
|
|
25
25
|
/** Resolve the work-tree root containing `sessionCwd`, failing closed. */
|
|
26
26
|
export async function resolveRepositoryRoot(run, sessionCwd, options) {
|
|
27
|
-
const result = await run([
|
|
27
|
+
const result = await run(["rev-parse", "--show-toplevel"], {
|
|
28
28
|
cwd: sessionCwd,
|
|
29
29
|
timeoutMs: options.timeoutMs,
|
|
30
30
|
maxBytes: 64 * 1024,
|
|
31
31
|
});
|
|
32
32
|
const root = result.stdout.trim();
|
|
33
|
-
if (result.exitCode !== 0 || root ===
|
|
34
|
-
throw new GitToolError(
|
|
35
|
-
|
|
33
|
+
if (result.exitCode !== 0 || root === "") {
|
|
34
|
+
throw new GitToolError("not-a-git-repository", `the selected directory is not inside a git work tree (${sessionCwd}); ` +
|
|
35
|
+
"pass repository to select a repository inside the session directory or an operator-configured repository root");
|
|
36
36
|
}
|
|
37
37
|
return root;
|
|
38
38
|
}
|
|
39
39
|
function pathIsInside(target, root) {
|
|
40
40
|
const relative = path.relative(root, target);
|
|
41
|
-
return (relative ===
|
|
42
|
-
(!relative.startsWith(`..${path.sep}`) &&
|
|
41
|
+
return (relative === "" ||
|
|
42
|
+
(!relative.startsWith(`..${path.sep}`) &&
|
|
43
|
+
relative !== ".." &&
|
|
44
|
+
!path.isAbsolute(relative)));
|
|
43
45
|
}
|
|
44
46
|
async function canonicalDirectory(input, label) {
|
|
45
47
|
try {
|
|
46
48
|
const canonical = await realpath(input);
|
|
47
49
|
if (!(await stat(canonical)).isDirectory())
|
|
48
|
-
throw new Error(
|
|
50
|
+
throw new Error("not a directory");
|
|
49
51
|
return canonical;
|
|
50
52
|
}
|
|
51
53
|
catch {
|
|
52
|
-
throw new GitToolError(
|
|
54
|
+
throw new GitToolError("invalid-repository", `${label} is not an existing directory (${input})`);
|
|
53
55
|
}
|
|
54
56
|
}
|
|
55
57
|
/**
|
|
@@ -63,35 +65,40 @@ export async function resolveToolRepository(run, exec, requested, options) {
|
|
|
63
65
|
const sessionCwd = requireSessionCwd(exec);
|
|
64
66
|
if (requested === undefined || requested === null) {
|
|
65
67
|
try {
|
|
66
|
-
return await resolveRepositoryRoot(run, sessionCwd, {
|
|
68
|
+
return await resolveRepositoryRoot(run, sessionCwd, {
|
|
69
|
+
timeoutMs: options.timeoutMs,
|
|
70
|
+
});
|
|
67
71
|
}
|
|
68
72
|
catch (error) {
|
|
69
|
-
if (!(error instanceof GitToolError) ||
|
|
73
|
+
if (!(error instanceof GitToolError) ||
|
|
74
|
+
error.code !== "not-a-git-repository")
|
|
70
75
|
throw error;
|
|
71
76
|
if (options.repositoryRoots.length === 1) {
|
|
72
77
|
return resolveToolRepository(run, exec, options.repositoryRoots[0], options);
|
|
73
78
|
}
|
|
74
79
|
if (options.repositoryRoots.length > 1) {
|
|
75
|
-
throw new GitToolError(
|
|
76
|
-
`select one configured repository root: ${options.repositoryRoots.join(
|
|
80
|
+
throw new GitToolError("not-a-git-repository", `the session directory is not inside a git work tree (${sessionCwd}); ` +
|
|
81
|
+
`select one configured repository root: ${options.repositoryRoots.join(", ")}`);
|
|
77
82
|
}
|
|
78
83
|
throw error;
|
|
79
84
|
}
|
|
80
85
|
}
|
|
81
|
-
if (typeof requested !==
|
|
82
|
-
throw new GitToolError(
|
|
86
|
+
if (typeof requested !== "string" || requested.trim() === "") {
|
|
87
|
+
throw new GitToolError("invalid-repository", "repository must be a non-empty path");
|
|
83
88
|
}
|
|
84
|
-
const canonicalSession = await canonicalDirectory(sessionCwd,
|
|
85
|
-
const configuredRoots = await Promise.all(options.repositoryRoots.map((root) => canonicalDirectory(root,
|
|
89
|
+
const canonicalSession = await canonicalDirectory(sessionCwd, "the session working directory");
|
|
90
|
+
const configuredRoots = await Promise.all(options.repositoryRoots.map((root) => canonicalDirectory(root, "a configured repository root")));
|
|
86
91
|
const allowedRoots = [canonicalSession, ...configuredRoots];
|
|
87
|
-
const selected = await canonicalDirectory(path.resolve(sessionCwd, requested.trim()),
|
|
92
|
+
const selected = await canonicalDirectory(path.resolve(sessionCwd, requested.trim()), "repository");
|
|
88
93
|
if (!allowedRoots.some((root) => pathIsInside(selected, root))) {
|
|
89
|
-
throw new GitToolError(
|
|
94
|
+
throw new GitToolError("repository-not-allowed", "repository is outside the session directory and configured repository roots");
|
|
90
95
|
}
|
|
91
|
-
const repoRoot = await resolveRepositoryRoot(run, selected, {
|
|
92
|
-
|
|
96
|
+
const repoRoot = await resolveRepositoryRoot(run, selected, {
|
|
97
|
+
timeoutMs: options.timeoutMs,
|
|
98
|
+
});
|
|
99
|
+
const canonicalRepoRoot = await canonicalDirectory(repoRoot, "the resolved repository root");
|
|
93
100
|
if (!allowedRoots.some((root) => pathIsInside(canonicalRepoRoot, root))) {
|
|
94
|
-
throw new GitToolError(
|
|
101
|
+
throw new GitToolError("repository-not-allowed", "the resolved git work tree escapes the allowed repository root");
|
|
95
102
|
}
|
|
96
103
|
return canonicalRepoRoot;
|
|
97
104
|
}
|
|
@@ -101,14 +108,14 @@ export async function resolveToolRepository(run, exec, requested, options) {
|
|
|
101
108
|
* model can only ever name a commit that git itself resolves.
|
|
102
109
|
*/
|
|
103
110
|
export async function canonicalizeCommit(run, repoRoot, oid, options) {
|
|
104
|
-
const result = await run([
|
|
111
|
+
const result = await run(["rev-parse", "--verify", "--end-of-options", `${oid}^{commit}`], {
|
|
105
112
|
cwd: repoRoot,
|
|
106
113
|
timeoutMs: options.timeoutMs,
|
|
107
114
|
maxBytes: 64 * 1024,
|
|
108
115
|
});
|
|
109
116
|
const full = result.stdout.trim();
|
|
110
117
|
if (result.exitCode !== 0 || !FULL_OID_PATTERN.test(full)) {
|
|
111
|
-
throw new GitToolError(
|
|
118
|
+
throw new GitToolError("invalid-oid", `no commit matches "${oid}" in this repository`);
|
|
112
119
|
}
|
|
113
120
|
return full;
|
|
114
121
|
}
|
package/lib/git/repo.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repo.js","sourceRoot":"","sources":["../../src/git/repo.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,IAAI,MAAM,WAAW,CAAC;AAI7B,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"repo.js","sourceRoot":"","sources":["../../src/git/repo.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,IAAI,MAAM,WAAW,CAAC;AAI7B,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAgBjD,uEAAuE;AACvE,MAAM,UAAU,iBAAiB,CAAC,IAAc;IAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;IACzB,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,MAAM,IAAI,YAAY,CACpB,gBAAgB,EAChB,4CAA4C,CAC7C,CAAC;IACJ,CAAC;IACD,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC;IACrC,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QACjD,MAAM,IAAI,YAAY,CACpB,gBAAgB,EAChB,wEAAwE,CACzE,CAAC;IACJ,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,0EAA0E;AAC1E,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,GAAc,EACd,UAAkB,EAClB,OAA8B;IAE9B,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,CAAC,WAAW,EAAE,iBAAiB,CAAC,EAAE;QACzD,GAAG,EAAE,UAAU;QACf,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,QAAQ,EAAE,EAAE,GAAG,IAAI;KACpB,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAClC,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;QACzC,MAAM,IAAI,YAAY,CACpB,sBAAsB,EACtB,yDAAyD,UAAU,KAAK;YACtE,+GAA+G,CAClH,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,YAAY,CAAC,MAAc,EAAE,IAAY;IAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC7C,OAAO,CACL,QAAQ,KAAK,EAAE;QACf,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC,GAAG,EAAE,CAAC;YACpC,QAAQ,KAAK,IAAI;YACjB,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAC9B,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,kBAAkB,CAC/B,KAAa,EACb,KAAa;IAEb,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,EAAE;YACxC,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACrC,OAAO,SAAS,CAAC;IACnB,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,YAAY,CACpB,oBAAoB,EACpB,GAAG,KAAK,kCAAkC,KAAK,GAAG,CACnD,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,GAAc,EACd,IAAc,EACd,SAAkB,EAClB,OAGC;IAED,MAAM,UAAU,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC3C,IAAI,SAAS,KAAK,SAAS,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;QAClD,IAAI,CAAC;YACH,OAAO,MAAM,qBAAqB,CAAC,GAAG,EAAE,UAAU,EAAE;gBAClD,SAAS,EAAE,OAAO,CAAC,SAAS;aAC7B,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IACE,CAAC,CAAC,KAAK,YAAY,YAAY,CAAC;gBAChC,KAAK,CAAC,IAAI,KAAK,sBAAsB;gBAErC,MAAM,KAAK,CAAC;YACd,IAAI,OAAO,CAAC,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACzC,OAAO,qBAAqB,CAC1B,GAAG,EACH,IAAI,EACJ,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,EAC1B,OAAO,CACR,CAAC;YACJ,CAAC;YACD,IAAI,OAAO,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvC,MAAM,IAAI,YAAY,CACpB,sBAAsB,EACtB,wDAAwD,UAAU,KAAK;oBACrE,0CAA0C,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACjF,CAAC;YACJ,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IACD,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QAC7D,MAAM,IAAI,YAAY,CACpB,oBAAoB,EACpB,qCAAqC,CACtC,CAAC;IACJ,CAAC;IAED,MAAM,gBAAgB,GAAG,MAAM,kBAAkB,CAC/C,UAAU,EACV,+BAA+B,CAChC,CAAC;IACF,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,GAAG,CACvC,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACnC,kBAAkB,CAAC,IAAI,EAAE,8BAA8B,CAAC,CACzD,CACF,CAAC;IACF,MAAM,YAAY,GAAG,CAAC,gBAAgB,EAAE,GAAG,eAAe,CAAC,CAAC;IAC5D,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CACvC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC,EAC1C,YAAY,CACb,CAAC;IACF,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC;QAC/D,MAAM,IAAI,YAAY,CACpB,wBAAwB,EACxB,6EAA6E,CAC9E,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,GAAG,EAAE,QAAQ,EAAE;QAC1D,SAAS,EAAE,OAAO,CAAC,SAAS;KAC7B,CAAC,CAAC;IACH,MAAM,iBAAiB,GAAG,MAAM,kBAAkB,CAChD,QAAQ,EACR,8BAA8B,CAC/B,CAAC;IACF,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC;QACxE,MAAM,IAAI,YAAY,CACpB,wBAAwB,EACxB,gEAAgE,CACjE,CAAC;IACJ,CAAC;IACD,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,GAAc,EACd,QAAgB,EAChB,GAAW,EACX,OAA8B;IAE9B,MAAM,MAAM,GAAG,MAAM,GAAG,CACtB,CAAC,WAAW,EAAE,UAAU,EAAE,kBAAkB,EAAE,GAAG,GAAG,WAAW,CAAC,EAChE;QACE,GAAG,EAAE,QAAQ;QACb,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,QAAQ,EAAE,EAAE,GAAG,IAAI;KACpB,CACF,CAAC;IACF,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAClC,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,YAAY,CACpB,aAAa,EACb,sBAAsB,GAAG,sBAAsB,CAChD,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
|