@praxis.guard/auditor-cli 0.0.57 → 0.0.59
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/dist/approval/hook-inline-approval.d.ts.map +1 -1
- package/dist/approval/hook-inline-approval.js +9 -0
- package/dist/approval/hook-inline-approval.js.map +1 -1
- package/dist/approval/mcp-flow.d.ts.map +1 -1
- package/dist/approval/mcp-flow.js +16 -1
- package/dist/approval/mcp-flow.js.map +1 -1
- package/dist/approval/redeem-storage-root.d.ts +7 -0
- package/dist/approval/redeem-storage-root.d.ts.map +1 -0
- package/dist/approval/redeem-storage-root.js +25 -0
- package/dist/approval/redeem-storage-root.js.map +1 -0
- package/dist/approval/redeem.d.ts +1 -1
- package/dist/approval/redeem.d.ts.map +1 -1
- package/dist/approval/redeem.js +66 -50
- package/dist/approval/redeem.js.map +1 -1
- package/dist/bridge/execution-ticket-consume.d.ts +1 -0
- package/dist/bridge/execution-ticket-consume.d.ts.map +1 -1
- package/dist/bridge/execution-ticket-consume.js +4 -94
- package/dist/bridge/execution-ticket-consume.js.map +1 -1
- package/dist/bridge/execution-ticket-files.d.ts +11 -0
- package/dist/bridge/execution-ticket-files.d.ts.map +1 -0
- package/dist/bridge/execution-ticket-files.js +86 -0
- package/dist/bridge/execution-ticket-files.js.map +1 -0
- package/dist/bridge/execution-ticket-record.d.ts +8 -9
- package/dist/bridge/execution-ticket-record.d.ts.map +1 -1
- package/dist/bridge/execution-ticket-record.js +32 -31
- package/dist/bridge/execution-ticket-record.js.map +1 -1
- package/dist/bridge/execution-ticket-scan.d.ts +7 -0
- package/dist/bridge/execution-ticket-scan.d.ts.map +1 -0
- package/dist/bridge/execution-ticket-scan.js +43 -0
- package/dist/bridge/execution-ticket-scan.js.map +1 -0
- package/dist/bridge/execution-ticket-token.d.ts +10 -0
- package/dist/bridge/execution-ticket-token.d.ts.map +1 -0
- package/dist/bridge/execution-ticket-token.js +57 -0
- package/dist/bridge/execution-ticket-token.js.map +1 -0
- package/dist/bridge/guard-storage-root.d.ts +3 -0
- package/dist/bridge/guard-storage-root.d.ts.map +1 -1
- package/dist/bridge/guard-storage-root.js +16 -6
- package/dist/bridge/guard-storage-root.js.map +1 -1
- package/dist/bridge/guard-workspace-session.d.ts +9 -0
- package/dist/bridge/guard-workspace-session.d.ts.map +1 -1
- package/dist/bridge/guard-workspace-session.js +38 -7
- package/dist/bridge/guard-workspace-session.js.map +1 -1
- package/dist/bridge/request-binding-index.d.ts +20 -0
- package/dist/bridge/request-binding-index.d.ts.map +1 -0
- package/dist/bridge/request-binding-index.js +100 -0
- package/dist/bridge/request-binding-index.js.map +1 -0
- package/dist/bridge/request-binding-write.d.ts +10 -0
- package/dist/bridge/request-binding-write.d.ts.map +1 -0
- package/dist/bridge/request-binding-write.js +21 -0
- package/dist/bridge/request-binding-write.js.map +1 -0
- package/dist/cli/doctor.d.ts.map +1 -1
- package/dist/cli/doctor.js +9 -0
- package/dist/cli/doctor.js.map +1 -1
- package/dist/hooks/agent-message.d.ts +2 -0
- package/dist/hooks/agent-message.d.ts.map +1 -1
- package/dist/hooks/agent-message.js +9 -46
- package/dist/hooks/agent-message.js.map +1 -1
- package/dist/hooks/mutate-deny-messages.d.ts +15 -0
- package/dist/hooks/mutate-deny-messages.d.ts.map +1 -0
- package/dist/hooks/mutate-deny-messages.js +57 -0
- package/dist/hooks/mutate-deny-messages.js.map +1 -0
- package/dist/hooks/run-before-mcp.d.ts.map +1 -1
- package/dist/hooks/run-before-mcp.js +3 -1
- package/dist/hooks/run-before-mcp.js.map +1 -1
- package/dist/hooks/run-before-shell.d.ts.map +1 -1
- package/dist/hooks/run-before-shell.js +3 -1
- package/dist/hooks/run-before-shell.js.map +1 -1
- package/dist/mcp/evaluate-guard.d.ts.map +1 -1
- package/dist/mcp/evaluate-guard.js +2 -1
- package/dist/mcp/evaluate-guard.js.map +1 -1
- package/dist/mcp/guard-schemas.d.ts.map +1 -1
- package/dist/mcp/guard-schemas.js +13 -7
- package/dist/mcp/guard-schemas.js.map +1 -1
- package/native/darwin-amd64/praxis-guard-daemon +0 -0
- package/native/darwin-amd64/praxis-guard-hook +0 -0
- package/native/darwin-arm64/praxis-guard-daemon +0 -0
- package/native/darwin-arm64/praxis-guard-hook +0 -0
- package/native/linux-amd64/praxis-guard-daemon +0 -0
- package/native/linux-amd64/praxis-guard-hook +0 -0
- package/native/linux-arm64/praxis-guard-daemon +0 -0
- package/native/linux-arm64/praxis-guard-hook +0 -0
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hook-inline-approval.d.ts","sourceRoot":"","sources":["../../src/approval/hook-inline-approval.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"hook-inline-approval.d.ts","sourceRoot":"","sources":["../../src/approval/hook-inline-approval.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,6BAA6B,CAAC;AAEnF,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,IAAI,EAAE,OAAO,GAAG,KAAK,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,oBAAoB,CAAC,EAAE,+BAA+B,GAAG,IAAI,CAAC;CAC/D,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,wBAAgB,yBAAyB,IAAI,OAAO,CAEnD;AAOD;;GAEG;AACH,wBAAsB,4BAA4B,CAChD,KAAK,EAAE,uBAAuB,GAC7B,OAAO,CAAC,wBAAwB,GAAG,IAAI,CAAC,CA8D1C"}
|
|
@@ -3,6 +3,7 @@ import { resolveGuardToken } from "../cli/credentials.js";
|
|
|
3
3
|
import { createApprovalRequest } from "./client.js";
|
|
4
4
|
import { resolveShellApprovalHash } from "./argv-fingerprint.js";
|
|
5
5
|
import { writePendingApprovalIndex } from "../bridge/pending-approval-index.js";
|
|
6
|
+
import { recordRequestBinding } from "../bridge/request-binding-write.js";
|
|
6
7
|
import { resolveGuardStorageRoot } from "../bridge/guard-storage-root.js";
|
|
7
8
|
export function hookInlineApprovalEnabled() {
|
|
8
9
|
return process.env.PRAXIS_HOOK_INLINE_APPROVAL !== "0";
|
|
@@ -56,6 +57,14 @@ export async function tryHookInlineApprovalRequest(input) {
|
|
|
56
57
|
kind: input.kind,
|
|
57
58
|
created_at: new Date().toISOString(),
|
|
58
59
|
}, { storageRoot });
|
|
60
|
+
recordRequestBinding({
|
|
61
|
+
request_id: created.request_id,
|
|
62
|
+
storage_root: storageRoot,
|
|
63
|
+
argv: input.argv,
|
|
64
|
+
kind: input.kind,
|
|
65
|
+
expires_at: created.expires_at,
|
|
66
|
+
approval_fingerprint: input.approval_fingerprint,
|
|
67
|
+
});
|
|
59
68
|
return created;
|
|
60
69
|
}
|
|
61
70
|
catch {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hook-inline-approval.js","sourceRoot":"","sources":["../../src/approval/hook-inline-approval.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"hook-inline-approval.js","sourceRoot":"","sources":["../../src/approval/hook-inline-approval.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-flow.d.ts","sourceRoot":"","sources":["../../src/approval/mcp-flow.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mcp-flow.d.ts","sourceRoot":"","sources":["../../src/approval/mcp-flow.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,6BAA6B,CAAC;AASnF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAC1B;IACE,IAAI,EAAE,kBAAkB,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,GACD;IACE,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,OAAO,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;CACpB,GACD;IACE,IAAI,EAAE,yBAAyB,CAAC;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB,GACD;IAAE,IAAI,EAAE,qBAAqB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAMrD,wBAAsB,qBAAqB,CAAC,KAAK,EAAE;IACjD,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,YAAY,EAAE,OAAO,GAAG,KAAK,CAAC;IAC9B,iEAAiE;IACjE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,QAAQ,CAAC,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACrC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,oBAAoB,CAAC,EAAE,+BAA+B,GAAG,IAAI,CAAC;CAC/D,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA4J9B;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAE/D;AAED,OAAO,EAAE,wBAAwB,EAAE,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { DEFAULT_APP_URL } from "../config/default-endpoints.js";
|
|
2
2
|
import { getInstallId } from "../cli/install-id.js";
|
|
3
|
-
import { resolveGuardStorageRoot } from "../bridge/guard-storage-root.js";
|
|
3
|
+
import { isReliableWorkspaceRoot, resolveGuardStorageRoot, } from "../bridge/guard-storage-root.js";
|
|
4
|
+
import { recordRequestBinding } from "../bridge/request-binding-write.js";
|
|
4
5
|
import { writePendingApprovalIndex } from "../bridge/pending-approval-index.js";
|
|
5
6
|
import { resolveShellApprovalHash } from "./argv-fingerprint.js";
|
|
6
7
|
import { createApprovalRequest, getApprovalRequest, pollUntilApproved, } from "./client.js";
|
|
@@ -64,6 +65,12 @@ export async function resolveMutateApproval(input) {
|
|
|
64
65
|
request_id: requestId,
|
|
65
66
|
};
|
|
66
67
|
}
|
|
68
|
+
if (!isReliableWorkspaceRoot(storageRoot)) {
|
|
69
|
+
return {
|
|
70
|
+
kind: "backend_unavailable",
|
|
71
|
+
message: "Cannot bind approval to a workspace root. Set proposal.cwd or context.workspace_root to the repo root where hooks run (must contain .git, .praxis, or .cursor/hooks.json).",
|
|
72
|
+
};
|
|
73
|
+
}
|
|
67
74
|
const created = await createApprovalRequest({
|
|
68
75
|
kind: input.proposalKind,
|
|
69
76
|
tier: "MUTATE",
|
|
@@ -78,6 +85,14 @@ export async function resolveMutateApproval(input) {
|
|
|
78
85
|
tool_input_sha256: input.tool_input_sha256 ?? null,
|
|
79
86
|
approval_scope: "exact",
|
|
80
87
|
});
|
|
88
|
+
recordRequestBinding({
|
|
89
|
+
request_id: created.request_id,
|
|
90
|
+
storage_root: storageRoot,
|
|
91
|
+
argv: input.argv,
|
|
92
|
+
kind: input.proposalKind,
|
|
93
|
+
expires_at: created.expires_at,
|
|
94
|
+
approval_fingerprint: input.approval_fingerprint,
|
|
95
|
+
});
|
|
81
96
|
if (input.waitMs && input.waitMs > 0) {
|
|
82
97
|
await pollUntilApproved(created.request_id, { timeoutMs: input.waitMs });
|
|
83
98
|
const redeem = await redeemApprovalAndRecordBridge({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-flow.js","sourceRoot":"","sources":["../../src/approval/mcp-flow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,
|
|
1
|
+
{"version":3,"file":"mcp-flow.js","sourceRoot":"","sources":["../../src/approval/mcp-flow.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
export type ResolveRedeemStorageRootInput = {
|
|
2
|
+
request_id: string;
|
|
3
|
+
kind: "shell" | "mcp";
|
|
4
|
+
storageRoot?: string;
|
|
5
|
+
};
|
|
6
|
+
export declare function resolveRedeemStorageRoot(input: ResolveRedeemStorageRootInput, argvHash: string): string;
|
|
7
|
+
//# sourceMappingURL=redeem-storage-root.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redeem-storage-root.d.ts","sourceRoot":"","sources":["../../src/approval/redeem-storage-root.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,6BAA6B,GAAG;IAC1C,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,OAAO,GAAG,KAAK,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,6BAA6B,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAuBvG"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { getInstallId } from "../cli/install-id.js";
|
|
2
|
+
import { isReliableWorkspaceRoot, resolveGuardStorageRoot, } from "../bridge/guard-storage-root.js";
|
|
3
|
+
import { readRequestBinding } from "../bridge/request-binding-index.js";
|
|
4
|
+
export function resolveRedeemStorageRoot(input, argvHash) {
|
|
5
|
+
const binding = readRequestBinding(input.request_id);
|
|
6
|
+
if (binding) {
|
|
7
|
+
if (binding.install_id !== getInstallId()) {
|
|
8
|
+
throw new Error("binding_install_mismatch");
|
|
9
|
+
}
|
|
10
|
+
if (binding.argv_sha256 !== argvHash) {
|
|
11
|
+
throw new Error("binding_argv_mismatch");
|
|
12
|
+
}
|
|
13
|
+
if (binding.kind !== input.kind) {
|
|
14
|
+
throw new Error("binding_kind_mismatch");
|
|
15
|
+
}
|
|
16
|
+
return binding.storage_root;
|
|
17
|
+
}
|
|
18
|
+
if (input.storageRoot?.trim()) {
|
|
19
|
+
const resolved = resolveGuardStorageRoot(input.storageRoot);
|
|
20
|
+
if (isReliableWorkspaceRoot(resolved))
|
|
21
|
+
return resolved;
|
|
22
|
+
}
|
|
23
|
+
throw new Error("binding_missing: call guard or retry from hook deny so request_id is bound to the workspace root");
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=redeem-storage-root.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redeem-storage-root.js","sourceRoot":"","sources":["../../src/approval/redeem-storage-root.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EACL,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAQxE,MAAM,UAAU,wBAAwB,CAAC,KAAoC,EAAE,QAAgB;IAC7F,MAAM,OAAO,GAAG,kBAAkB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACrD,IAAI,OAAO,EAAE,CAAC;QACZ,IAAI,OAAO,CAAC,UAAU,KAAK,YAAY,EAAE,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,OAAO,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC3C,CAAC;QACD,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC3C,CAAC;QACD,OAAO,OAAO,CAAC,YAAY,CAAC;IAC9B,CAAC;IAED,IAAI,KAAK,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,CAAC;QAC9B,MAAM,QAAQ,GAAG,uBAAuB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC5D,IAAI,uBAAuB,CAAC,QAAQ,CAAC;YAAE,OAAO,QAAQ,CAAC;IACzD,CAAC;IAED,MAAM,IAAI,KAAK,CACb,kGAAkG,CACnG,CAAC;AACJ,CAAC"}
|
|
@@ -3,7 +3,7 @@ export type RedeemAndBridgeInput = {
|
|
|
3
3
|
request_id: string;
|
|
4
4
|
argv: string[];
|
|
5
5
|
kind: "shell" | "mcp";
|
|
6
|
-
/**
|
|
6
|
+
/** Explicit workspace hint when no binding exists (must be reliable). */
|
|
7
7
|
storageRoot?: string;
|
|
8
8
|
grant?: string | null;
|
|
9
9
|
environment?: string | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redeem.d.ts","sourceRoot":"","sources":["../../src/approval/redeem.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"redeem.d.ts","sourceRoot":"","sources":["../../src/approval/redeem.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,6BAA6B,CAAC;AAEnF,MAAM,MAAM,oBAAoB,GAAG;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,IAAI,EAAE,OAAO,GAAG,KAAK,CAAC;IACtB,yEAAyE;IACzE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,oBAAoB,CAAC,EAAE,+BAA+B,GAAG,IAAI,CAAC;CAC/D,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,0DAA0D;IAC1D,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,OAAO,CAAC;IACxB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC,CAAC;AAyDF;;GAEG;AACH,wBAAsB,6BAA6B,CACjD,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,qBAAqB,CAAC,CAgDhC"}
|
package/dist/approval/redeem.js
CHANGED
|
@@ -1,81 +1,97 @@
|
|
|
1
1
|
import { getInstallId } from "../cli/install-id.js";
|
|
2
|
-
import { resolveGuardStorageRoot } from "../bridge/guard-storage-root.js";
|
|
3
2
|
import { recordExecutionTicket } from "../bridge/execution-ticket.js";
|
|
3
|
+
import { findExistingExecutionTicket } from "../bridge/execution-ticket-scan.js";
|
|
4
4
|
import { resolveShellApprovalHash } from "./argv-fingerprint.js";
|
|
5
5
|
import { getApprovalRequest, redeemApprovalGrant } from "./client.js";
|
|
6
6
|
import { verifyApprovalGrant } from "./grant.js";
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
const installId = getInstallId();
|
|
12
|
-
const hash = resolveShellApprovalHash({
|
|
13
|
-
kind: input.kind,
|
|
14
|
-
argv: input.argv,
|
|
15
|
-
approval_fingerprint: input.approval_fingerprint,
|
|
16
|
-
});
|
|
17
|
-
const storageRoot = resolveGuardStorageRoot(input.storageRoot);
|
|
18
|
-
let grant = input.grant?.trim() || null;
|
|
19
|
-
if (grant) {
|
|
20
|
-
const claims = verifyApprovalGrant(grant);
|
|
21
|
-
if (!claims)
|
|
22
|
-
throw new Error("invalid_grant");
|
|
23
|
-
if (claims.request_id !== input.request_id)
|
|
24
|
-
throw new Error("request_id_mismatch");
|
|
25
|
-
if (claims.argv_sha256 !== hash)
|
|
26
|
-
throw new Error("argv_mismatch");
|
|
27
|
-
if (claims.install_id !== installId)
|
|
28
|
-
throw new Error("install_id_mismatch");
|
|
29
|
-
}
|
|
30
|
-
else {
|
|
7
|
+
import { resolveRedeemStorageRoot } from "./redeem-storage-root.js";
|
|
8
|
+
async function assertRedeemPreconditions(input, hash, installId) {
|
|
9
|
+
const grant = input.grant?.trim() || null;
|
|
10
|
+
if (!grant) {
|
|
31
11
|
const row = await getApprovalRequest(input.request_id);
|
|
32
12
|
if (row.status !== "approved") {
|
|
33
13
|
throw new Error(`approval_not_ready:${row.status}`);
|
|
34
14
|
}
|
|
15
|
+
return null;
|
|
35
16
|
}
|
|
36
|
-
|
|
17
|
+
const claims = verifyApprovalGrant(grant);
|
|
18
|
+
if (!claims)
|
|
19
|
+
throw new Error("invalid_grant");
|
|
20
|
+
if (claims.request_id !== input.request_id)
|
|
21
|
+
throw new Error("request_id_mismatch");
|
|
22
|
+
if (claims.argv_sha256 !== hash)
|
|
23
|
+
throw new Error("argv_mismatch");
|
|
24
|
+
if (claims.install_id !== installId)
|
|
25
|
+
throw new Error("install_id_mismatch");
|
|
26
|
+
return grant;
|
|
27
|
+
}
|
|
28
|
+
async function redeemOrReturnExistingTicket(input, grant, installId, storageRoot, hash) {
|
|
37
29
|
try {
|
|
38
|
-
redeem = await redeemApprovalGrant({
|
|
30
|
+
const redeem = await redeemApprovalGrant({
|
|
39
31
|
request_id: input.request_id,
|
|
40
32
|
grant: grant ?? "pending",
|
|
41
33
|
install_id: installId,
|
|
42
34
|
argv: [...input.argv],
|
|
43
35
|
});
|
|
36
|
+
return { redeem, ticketRecorded: false };
|
|
44
37
|
}
|
|
45
38
|
catch (e) {
|
|
46
39
|
const msg = e instanceof Error ? e.message : String(e);
|
|
47
|
-
if (msg.includes("already_redeemed")
|
|
48
|
-
redeem = {
|
|
49
|
-
redeemed: true,
|
|
50
|
-
approved_by: null,
|
|
51
|
-
execution_ticket: null,
|
|
52
|
-
};
|
|
53
|
-
}
|
|
54
|
-
else {
|
|
40
|
+
if (!msg.includes("already_redeemed") && !msg.includes("409"))
|
|
55
41
|
throw e;
|
|
56
|
-
|
|
42
|
+
const existing = await findExistingExecutionTicket({
|
|
43
|
+
storageRoot,
|
|
44
|
+
request_id: input.request_id,
|
|
45
|
+
argv_sha256: hash,
|
|
46
|
+
});
|
|
47
|
+
return {
|
|
48
|
+
redeem: { redeemed: true, approved_by: null, execution_ticket: null },
|
|
49
|
+
ticketRecorded: existing,
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
/**
|
|
54
|
+
* After backend status is `approved`, redeem the one-shot grant and record execution ticket for hooks.
|
|
55
|
+
*/
|
|
56
|
+
export async function redeemApprovalAndRecordBridge(input) {
|
|
57
|
+
const installId = getInstallId();
|
|
58
|
+
const hash = resolveShellApprovalHash({
|
|
59
|
+
kind: input.kind,
|
|
60
|
+
argv: input.argv,
|
|
61
|
+
approval_fingerprint: input.approval_fingerprint,
|
|
62
|
+
});
|
|
63
|
+
const storageRoot = resolveRedeemStorageRoot(input, hash);
|
|
64
|
+
const grant = await assertRedeemPreconditions(input, hash, installId);
|
|
65
|
+
const { redeem, ticketRecorded: alreadyRecorded } = await redeemOrReturnExistingTicket(input, grant, installId, storageRoot, hash);
|
|
66
|
+
if (alreadyRecorded || !redeem.execution_ticket) {
|
|
67
|
+
return {
|
|
68
|
+
redeemed: redeem.redeemed,
|
|
69
|
+
approved_by: redeem.approved_by,
|
|
70
|
+
bridgeRecorded: false,
|
|
71
|
+
ticketRecorded: alreadyRecorded,
|
|
72
|
+
execution_ticket: redeem.execution_ticket,
|
|
73
|
+
};
|
|
57
74
|
}
|
|
58
75
|
let ticketRecorded = false;
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
}
|
|
76
|
+
try {
|
|
77
|
+
await recordExecutionTicket(redeem.execution_ticket, input.argv, {
|
|
78
|
+
storageRoot,
|
|
79
|
+
kind: input.kind,
|
|
80
|
+
approval_fingerprint: input.approval_fingerprint,
|
|
81
|
+
request_id: input.request_id,
|
|
82
|
+
argv_sha256: hash,
|
|
83
|
+
});
|
|
84
|
+
ticketRecorded = true;
|
|
85
|
+
}
|
|
86
|
+
catch {
|
|
87
|
+
ticketRecorded = false;
|
|
72
88
|
}
|
|
73
89
|
return {
|
|
74
90
|
redeemed: redeem.redeemed,
|
|
75
91
|
approved_by: redeem.approved_by,
|
|
76
92
|
bridgeRecorded: false,
|
|
77
93
|
ticketRecorded,
|
|
78
|
-
execution_ticket:
|
|
94
|
+
execution_ticket: redeem.execution_ticket,
|
|
79
95
|
};
|
|
80
96
|
}
|
|
81
97
|
//# sourceMappingURL=redeem.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redeem.js","sourceRoot":"","sources":["../../src/approval/redeem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"redeem.js","sourceRoot":"","sources":["../../src/approval/redeem.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { ShellApprovalFingerprintPayload } from "../shell/analyze-command.js";
|
|
2
2
|
export declare const EXECUTION_TICKET_ENV = "PRAXIS_GUARD_EXECUTION_TICKET";
|
|
3
|
+
export { tryConsumeTicketToken } from "./execution-ticket-token.js";
|
|
3
4
|
/**
|
|
4
5
|
* Verify a signed execution ticket locally and consume it once (env var or ticket files).
|
|
5
6
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution-ticket-consume.d.ts","sourceRoot":"","sources":["../../src/bridge/execution-ticket-consume.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"execution-ticket-consume.d.ts","sourceRoot":"","sources":["../../src/bridge/execution-ticket-consume.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,6BAA6B,CAAC;AAInF,eAAO,MAAM,oBAAoB,kCAAkC,CAAC;AAEpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEpE;;GAEG;AACH,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,IAAI,CAAC,EAAE;IACL,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,oBAAoB,CAAC,EAAE,+BAA+B,GAAG,IAAI,CAAC;CAC/D,GACA,OAAO,CAAC,OAAO,CAAC,CAMlB"}
|
|
@@ -1,14 +1,7 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import
|
|
3
|
-
import { getInstallId } from "../cli/install-id.js";
|
|
4
|
-
import { verifyExecutionTicket } from "../approval/grant.js";
|
|
5
|
-
import { resolveShellApprovalHash } from "../approval/argv-fingerprint.js";
|
|
6
|
-
import { guardSubpath } from "./guard-storage-root.js";
|
|
7
|
-
import { argvMatchesApproval, shellApprovalId } from "./execution-ticket-match.js";
|
|
1
|
+
import { tryConsumeExecutionTicketFiles } from "./execution-ticket-files.js";
|
|
2
|
+
import { tryConsumeTicketToken } from "./execution-ticket-token.js";
|
|
8
3
|
export const EXECUTION_TICKET_ENV = "PRAXIS_GUARD_EXECUTION_TICKET";
|
|
9
|
-
|
|
10
|
-
return guardSubpath("tickets", storageRoot);
|
|
11
|
-
}
|
|
4
|
+
export { tryConsumeTicketToken } from "./execution-ticket-token.js";
|
|
12
5
|
/**
|
|
13
6
|
* Verify a signed execution ticket locally and consume it once (env var or ticket files).
|
|
14
7
|
*/
|
|
@@ -17,89 +10,6 @@ export async function tryConsumeExecutionTicket(argv, opts) {
|
|
|
17
10
|
if (fromEnv && tryConsumeTicketToken(fromEnv, argv, opts)) {
|
|
18
11
|
return true;
|
|
19
12
|
}
|
|
20
|
-
|
|
21
|
-
let names = [];
|
|
22
|
-
try {
|
|
23
|
-
names = await readdir(dir);
|
|
24
|
-
}
|
|
25
|
-
catch {
|
|
26
|
-
return false;
|
|
27
|
-
}
|
|
28
|
-
const now = Date.now();
|
|
29
|
-
const approvalId = shellApprovalId(argv, opts?.approval_fingerprint);
|
|
30
|
-
const candidates = opts?.kind === "mcp"
|
|
31
|
-
? names.filter((n) => n.endsWith(".json"))
|
|
32
|
-
: names.filter((n) => n.startsWith(`${approvalId}_`) && n.endsWith(".json"));
|
|
33
|
-
for (const name of candidates) {
|
|
34
|
-
const file = path.join(dir, name);
|
|
35
|
-
try {
|
|
36
|
-
const raw = await readFile(file, "utf8");
|
|
37
|
-
const row = JSON.parse(raw);
|
|
38
|
-
if (typeof row.exp !== "number" || row.exp < now) {
|
|
39
|
-
await unlink(file).catch(() => { });
|
|
40
|
-
continue;
|
|
41
|
-
}
|
|
42
|
-
if (!argvMatchesApproval(row.argv, argv, opts?.kind ?? row.kind, row.fingerprint, opts?.approval_fingerprint)) {
|
|
43
|
-
continue;
|
|
44
|
-
}
|
|
45
|
-
const ticket = typeof row.ticket === "string" ? row.ticket : "";
|
|
46
|
-
if (!ticket ||
|
|
47
|
-
!tryConsumeTicketToken(ticket, argv, {
|
|
48
|
-
kind: opts?.kind ?? row.kind,
|
|
49
|
-
tool_input_sha256: opts?.tool_input_sha256,
|
|
50
|
-
approved_argv: row.argv,
|
|
51
|
-
approval_fingerprint: opts?.approval_fingerprint,
|
|
52
|
-
approved_fingerprint: row.fingerprint,
|
|
53
|
-
})) {
|
|
54
|
-
continue;
|
|
55
|
-
}
|
|
56
|
-
if (row.kind && opts?.kind && row.kind !== opts.kind)
|
|
57
|
-
continue;
|
|
58
|
-
await unlink(file);
|
|
59
|
-
return true;
|
|
60
|
-
}
|
|
61
|
-
catch {
|
|
62
|
-
continue;
|
|
63
|
-
}
|
|
64
|
-
}
|
|
65
|
-
return false;
|
|
66
|
-
}
|
|
67
|
-
function tryConsumeTicketToken(ticket, argv, opts) {
|
|
68
|
-
const claims = verifyExecutionTicket(ticket);
|
|
69
|
-
const expectedHash = resolveShellApprovalHash({
|
|
70
|
-
kind: opts?.kind ?? "shell",
|
|
71
|
-
argv,
|
|
72
|
-
approval_fingerprint: opts?.approval_fingerprint,
|
|
73
|
-
});
|
|
74
|
-
if (!claims) {
|
|
75
|
-
return argvMatchesApproval(opts?.approved_argv, argv, opts?.kind, opts?.approved_fingerprint, opts?.approval_fingerprint);
|
|
76
|
-
}
|
|
77
|
-
const approvedArgv = opts?.approved_argv;
|
|
78
|
-
const approvedHash = resolveShellApprovalHash({
|
|
79
|
-
kind: opts?.kind ?? claims.kind ?? "shell",
|
|
80
|
-
argv: approvedArgv ?? argv,
|
|
81
|
-
approval_fingerprint: opts?.approved_fingerprint ?? opts?.approval_fingerprint,
|
|
82
|
-
});
|
|
83
|
-
if (approvedArgv) {
|
|
84
|
-
if (claims.argv_sha256 !== approvedHash)
|
|
85
|
-
return false;
|
|
86
|
-
if (!argvMatchesApproval(approvedArgv, argv, opts?.kind ?? claims.kind, opts?.approved_fingerprint, opts?.approval_fingerprint)) {
|
|
87
|
-
return false;
|
|
88
|
-
}
|
|
89
|
-
}
|
|
90
|
-
else if (claims.argv_sha256 !== expectedHash) {
|
|
91
|
-
return false;
|
|
92
|
-
}
|
|
93
|
-
if (claims.install_id !== getInstallId())
|
|
94
|
-
return false;
|
|
95
|
-
if (opts?.kind && claims.kind !== opts.kind)
|
|
96
|
-
return false;
|
|
97
|
-
const expectedToolHash = opts?.tool_input_sha256?.trim() || null;
|
|
98
|
-
const claimToolHash = typeof claims.tool_input_sha256 === "string" ? claims.tool_input_sha256.trim() : null;
|
|
99
|
-
if (claimToolHash && expectedToolHash && claimToolHash !== expectedToolHash)
|
|
100
|
-
return false;
|
|
101
|
-
if (claimToolHash && !expectedToolHash)
|
|
102
|
-
return false;
|
|
103
|
-
return true;
|
|
13
|
+
return tryConsumeExecutionTicketFiles(argv, opts);
|
|
104
14
|
}
|
|
105
15
|
//# sourceMappingURL=execution-ticket-consume.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution-ticket-consume.js","sourceRoot":"","sources":["../../src/bridge/execution-ticket-consume.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"execution-ticket-consume.js","sourceRoot":"","sources":["../../src/bridge/execution-ticket-consume.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,8BAA8B,EAAE,MAAM,6BAA6B,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEpE,MAAM,CAAC,MAAM,oBAAoB,GAAG,+BAA+B,CAAC;AAEpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEpE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,IAAuB,EACvB,IAKC;IAED,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,IAAI,EAAE,CAAC;IAC1D,IAAI,OAAO,IAAI,qBAAqB,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;QAC1D,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,8BAA8B,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACpD,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { ShellApprovalFingerprintPayload } from "../shell/analyze-command.js";
|
|
2
|
+
type TicketConsumeOpts = {
|
|
3
|
+
kind?: "shell" | "mcp";
|
|
4
|
+
tool_input_sha256?: string | null;
|
|
5
|
+
approval_fingerprint?: ShellApprovalFingerprintPayload | null;
|
|
6
|
+
};
|
|
7
|
+
export declare function tryConsumeExecutionTicketFiles(argv: readonly string[], opts?: TicketConsumeOpts & {
|
|
8
|
+
storageRoot?: string;
|
|
9
|
+
}): Promise<boolean>;
|
|
10
|
+
export {};
|
|
11
|
+
//# sourceMappingURL=execution-ticket-files.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"execution-ticket-files.d.ts","sourceRoot":"","sources":["../../src/bridge/execution-ticket-files.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,6BAA6B,CAAC;AAgBnF,KAAK,iBAAiB,GAAG;IACvB,IAAI,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,oBAAoB,CAAC,EAAE,+BAA+B,GAAG,IAAI,CAAC;CAC/D,CAAC;AAuEF,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,IAAI,CAAC,EAAE,iBAAiB,GAAG;IAAE,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,GAClD,OAAO,CAAC,OAAO,CAAC,CAwBlB"}
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
import { readdir, readFile, unlink } from "node:fs/promises";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
import { guardSubpath } from "./guard-storage-root.js";
|
|
4
|
+
import { deleteRequestBinding } from "./request-binding-index.js";
|
|
5
|
+
import { argvMatchesApproval, shellApprovalId } from "./execution-ticket-match.js";
|
|
6
|
+
import { tryConsumeTicketToken } from "./execution-ticket-token.js";
|
|
7
|
+
function executionTicketDir(storageRoot) {
|
|
8
|
+
return guardSubpath("tickets", storageRoot);
|
|
9
|
+
}
|
|
10
|
+
function storageRootMatchesClaim(hookRoot, claim) {
|
|
11
|
+
if (!claim?.trim())
|
|
12
|
+
return true;
|
|
13
|
+
if (!hookRoot?.trim())
|
|
14
|
+
return false;
|
|
15
|
+
return path.resolve(claim.trim()) === path.resolve(hookRoot.trim());
|
|
16
|
+
}
|
|
17
|
+
function ticketFileCandidates(names, kind, approvalId) {
|
|
18
|
+
if (kind === "mcp")
|
|
19
|
+
return names.filter((n) => n.endsWith(".json"));
|
|
20
|
+
return names.filter((n) => n.startsWith(`${approvalId}_`) && n.endsWith(".json"));
|
|
21
|
+
}
|
|
22
|
+
function rowKindMatches(row, opts) {
|
|
23
|
+
return !(row.kind && opts?.kind && row.kind !== opts.kind);
|
|
24
|
+
}
|
|
25
|
+
function rowArgvMatches(row, argv, opts) {
|
|
26
|
+
const kind = opts?.kind ?? row.kind;
|
|
27
|
+
return argvMatchesApproval(row.argv, argv, kind, row.fingerprint, opts?.approval_fingerprint);
|
|
28
|
+
}
|
|
29
|
+
function rowTokenValid(row, argv, opts) {
|
|
30
|
+
const ticket = typeof row.ticket === "string" ? row.ticket : "";
|
|
31
|
+
if (!ticket)
|
|
32
|
+
return false;
|
|
33
|
+
const kind = opts.kind ?? row.kind;
|
|
34
|
+
return tryConsumeTicketToken(ticket, argv, {
|
|
35
|
+
kind,
|
|
36
|
+
tool_input_sha256: opts.tool_input_sha256,
|
|
37
|
+
approved_argv: row.argv,
|
|
38
|
+
approval_fingerprint: opts.approval_fingerprint,
|
|
39
|
+
approved_fingerprint: row.fingerprint,
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
async function tryConsumeStoredTicketFile(file, argv, hookRoot, now, opts) {
|
|
43
|
+
const raw = await readFile(file, "utf8");
|
|
44
|
+
const row = JSON.parse(raw);
|
|
45
|
+
if (!storageRootMatchesClaim(hookRoot, row.storage_root))
|
|
46
|
+
return false;
|
|
47
|
+
if (typeof row.exp !== "number" || row.exp < now) {
|
|
48
|
+
await unlink(file).catch(() => { });
|
|
49
|
+
return false;
|
|
50
|
+
}
|
|
51
|
+
if (!opts || !rowArgvMatches(row, argv, opts) || !rowKindMatches(row, opts))
|
|
52
|
+
return false;
|
|
53
|
+
if (!rowTokenValid(row, argv, opts))
|
|
54
|
+
return false;
|
|
55
|
+
await unlink(file);
|
|
56
|
+
if (typeof row.request_id === "string" && row.request_id.trim()) {
|
|
57
|
+
deleteRequestBinding(row.request_id.trim());
|
|
58
|
+
}
|
|
59
|
+
return true;
|
|
60
|
+
}
|
|
61
|
+
export async function tryConsumeExecutionTicketFiles(argv, opts) {
|
|
62
|
+
const hookRoot = opts?.storageRoot ? path.resolve(opts.storageRoot) : undefined;
|
|
63
|
+
const dir = executionTicketDir(hookRoot);
|
|
64
|
+
let names = [];
|
|
65
|
+
try {
|
|
66
|
+
names = await readdir(dir);
|
|
67
|
+
}
|
|
68
|
+
catch {
|
|
69
|
+
return false;
|
|
70
|
+
}
|
|
71
|
+
const now = Date.now();
|
|
72
|
+
const approvalId = shellApprovalId(argv, opts?.approval_fingerprint);
|
|
73
|
+
const candidates = ticketFileCandidates(names, opts?.kind, approvalId);
|
|
74
|
+
for (const name of candidates) {
|
|
75
|
+
try {
|
|
76
|
+
if (await tryConsumeStoredTicketFile(path.join(dir, name), argv, hookRoot, now, opts)) {
|
|
77
|
+
return true;
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
catch {
|
|
81
|
+
continue;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
return false;
|
|
85
|
+
}
|
|
86
|
+
//# sourceMappingURL=execution-ticket-files.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"execution-ticket-files.js","sourceRoot":"","sources":["../../src/bridge/execution-ticket-files.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
import type { ShellApprovalFingerprintPayload } from "../shell/analyze-command.js";
|
|
2
|
-
|
|
3
|
-
* After redeem, persist a signed execution ticket for hook verification (dual-write with bridge).
|
|
4
|
-
*
|
|
5
|
-
* When a fingerprint is provided the primary file is indexed by the fingerprint hash.
|
|
6
|
-
* We also write an argv-hash alias so hooks that lack fingerprint context (e.g. the
|
|
7
|
-
* Claude Code PreToolUse hook) can find and consume the ticket by argv alone.
|
|
8
|
-
*/
|
|
9
|
-
export declare function recordExecutionTicket(ticket: string, argv: readonly string[], opts?: {
|
|
2
|
+
export type RecordExecutionTicketOpts = {
|
|
10
3
|
storageRoot?: string;
|
|
11
4
|
kind?: "shell" | "mcp";
|
|
12
5
|
approval_fingerprint?: ShellApprovalFingerprintPayload | null;
|
|
13
|
-
|
|
6
|
+
request_id?: string;
|
|
7
|
+
argv_sha256?: string;
|
|
8
|
+
};
|
|
9
|
+
/**
|
|
10
|
+
* After redeem, persist a signed execution ticket for hook verification (dual-write with bridge).
|
|
11
|
+
*/
|
|
12
|
+
export declare function recordExecutionTicket(ticket: string, argv: readonly string[], opts?: RecordExecutionTicketOpts): Promise<void>;
|
|
14
13
|
//# sourceMappingURL=execution-ticket-record.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution-ticket-record.d.ts","sourceRoot":"","sources":["../../src/bridge/execution-ticket-record.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"execution-ticket-record.d.ts","sourceRoot":"","sources":["../../src/bridge/execution-ticket-record.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,6BAA6B,CAAC;AAGnF,MAAM,MAAM,yBAAyB,GAAG;IACtC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC;IACvB,oBAAoB,CAAC,EAAE,+BAA+B,GAAG,IAAI,CAAC;IAC9D,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AA+CF;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,IAAI,CAAC,EAAE,yBAAyB,GAC/B,OAAO,CAAC,IAAI,CAAC,CAuBf"}
|