@crediolabs/policy-builder-cli 0.1.18 → 0.2.0

package/README.md

@@ -58,9 +58,11 @@ small: the two commands that fit a pipe.
 
 ## Security model
 
-The CLI holds no key material and signs nothing. The on-chain interpreter the
-policies target is **unaudited**; see the
-[architecture document](https://github.com/untangledfinance/octogate/blob/main/docs/architecture.md).
+The CLI holds no key material and signs nothing. See the
+[architecture document](https://github.com/untangledfinance/octogate/blob/main/docs/architecture.md)
+for what the on-chain interpreter does and does not enforce, and the
+[repository README](https://github.com/untangledfinance/octogate#readme) for
+the contracts' audit status.
 
 ## License
 

package/dist/bin/policy-builder.js

@@ -26,6 +26,7 @@
 // `command + subcommand-flags + global-flags` and dispatches to the matching
 // command body. Bad args -> CliError -> non-zero exit (JSON envelope under
 // --json).
+import { runMergeCommand } from "../src/commands/merge.js";
 import { runRecordCommand } from "../src/commands/record.js";
 import { runSynthesizeCommand } from "../src/commands/synthesize.js";
 import { emitCliError, parseFlags } from "../src/output.js";
@@ -47,6 +48,10 @@ async function main() {
                 await runSynthesizeCommand(subcommandArgs, flags);
                 return;
             }
+            case 'merge': {
+                await runMergeCommand(subcommandArgs, flags);
+                return;
+            }
             case 'help':
             case '--help':
             case '-h':
@@ -68,6 +73,10 @@ function printHelp() {
 
 Usage:
   policy-builder record     --network <mainnet|testnet> --hash <tx> | --xdr <b64>
+  policy-builder merge      --smart-account <C...> --source-account <G...>
+                            --rule-id <n> --predicate <b64> --step <detach|reinstall>
+                            [--network <mainnet|testnet>] [--rpc-url <url>]
+                            [--json] [--quiet] [--out <path>]
                             [--json] [--quiet] [--out <path>]
   policy-builder synthesize --mandate <path.json>
                             [--oz-config <path.json>] [--confidence <0..1>]

package/dist/src/commands/merge.d.ts

@@ -0,0 +1,2 @@
+import { type CliFlags } from '../output.ts';
+export declare function runMergeCommand(argv: ReadonlyArray<string>, flags: CliFlags): Promise<import("@crediolabs/policy-synth/run").MergePolicyResult>;

package/dist/src/commands/merge.js

@@ -0,0 +1,58 @@
+// packages/policy-builder-cli/src/commands/merge.ts
+//
+// `policy-builder merge` subcommand. The tightening remedy for a cross-rule
+// authority overlap.
+//
+// OpenZeppelin enforces only the policies of the context rule a signer NAMES,
+// so a signer in several rules picks which one applies and their authority is
+// the maximum over the matching rules. Adding a second, tighter rule therefore
+// restricts nothing. To actually tighten, the restriction has to become ONE
+// predicate: the conjunction of the installed one and the new one.
+//
+// Two transactions, in order, because `add_policy` refuses a policy already
+// attached to the rule:
+//
+//   policy-builder merge --step detach    ...  sign and submit, wait
+//   policy-builder merge --step reinstall ...  sign and submit
+//
+// The detach uninstalls the policy, which resets every counter on the rule and
+// leaves it unpoliced until the reinstall confirms. Both are reported as
+// warnings rather than left for the operator to discover afterwards.
+import { runMergePolicy } from '@crediolabs/policy-synth/run';
+import { CliError, formatToolResponse, parsePairs } from "../output.js";
+function missing(message) {
+    return new CliError({
+        code: 'CLI_MISSING_ARG',
+        message,
+        severity: 'error',
+        retryable: false,
+    });
+}
+function required(pairs, name) {
+    const value = pairs[name];
+    if (!value)
+        throw missing(`merge: --${name} is required`);
+    return value;
+}
+export async function runMergeCommand(argv, flags) {
+    const pairs = parsePairs(argv);
+    const step = required(pairs, 'step');
+    if (step !== 'detach' && step !== 'reinstall') {
+        throw missing("merge: --step must be 'detach' or 'reinstall'");
+    }
+    const ruleId = Number(required(pairs, 'rule-id'));
+    if (!Number.isInteger(ruleId) || ruleId < 0) {
+        throw missing('merge: --rule-id must be a non-negative integer');
+    }
+    const res = await runMergePolicy({
+        smartAccount: required(pairs, 'smart-account'),
+        sourceAccount: required(pairs, 'source-account'),
+        ruleId,
+        incomingPredicateBlobBase64: required(pairs, 'predicate'),
+        step,
+        ...(pairs.network ? { network: pairs.network } : {}),
+        ...(pairs['rpc-url'] ? { rpcUrl: pairs['rpc-url'] } : {}),
+        ...(pairs['allow-unpinned-rpc-url'] === 'true' ? { allowUnpinnedRpcUrl: true } : {}),
+    });
+    return formatToolResponse(res, flags);
+}

package/dist/src/index.d.ts

@@ -1,3 +1,4 @@
+export { runMergeCommand } from './commands/merge.ts';
 export { runRecordCommand } from './commands/record.ts';
 export { runSynthesizeCommand } from './commands/synthesize.ts';
 export { formatToolResponse, readJsonFile, writeJsonFile } from './output.ts';

package/dist/src/index.js

@@ -1,4 +1,5 @@
 // packages/policy-builder-cli/src/index.ts - public re-exports for the CLI package.
+export { runMergeCommand } from "./commands/merge.js";
 export { runRecordCommand } from "./commands/record.js";
 export { runSynthesizeCommand } from "./commands/synthesize.js";
 export { formatToolResponse, readJsonFile, writeJsonFile } from "./output.js";

package/dist-cjs/src/commands/merge.d.ts

@@ -0,0 +1,2 @@
+import { type CliFlags } from '../output.ts';
+export declare function runMergeCommand(argv: ReadonlyArray<string>, flags: CliFlags): Promise<import("@crediolabs/policy-synth/run").MergePolicyResult>;

package/dist-cjs/src/commands/merge.js

@@ -0,0 +1,61 @@
+"use strict";
+// packages/policy-builder-cli/src/commands/merge.ts
+//
+// `policy-builder merge` subcommand. The tightening remedy for a cross-rule
+// authority overlap.
+//
+// OpenZeppelin enforces only the policies of the context rule a signer NAMES,
+// so a signer in several rules picks which one applies and their authority is
+// the maximum over the matching rules. Adding a second, tighter rule therefore
+// restricts nothing. To actually tighten, the restriction has to become ONE
+// predicate: the conjunction of the installed one and the new one.
+//
+// Two transactions, in order, because `add_policy` refuses a policy already
+// attached to the rule:
+//
+//   policy-builder merge --step detach    ...  sign and submit, wait
+//   policy-builder merge --step reinstall ...  sign and submit
+//
+// The detach uninstalls the policy, which resets every counter on the rule and
+// leaves it unpoliced until the reinstall confirms. Both are reported as
+// warnings rather than left for the operator to discover afterwards.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runMergeCommand = runMergeCommand;
+const run_1 = require("@crediolabs/policy-synth/run");
+const output_ts_1 = require("../output.js");
+function missing(message) {
+    return new output_ts_1.CliError({
+        code: 'CLI_MISSING_ARG',
+        message,
+        severity: 'error',
+        retryable: false,
+    });
+}
+function required(pairs, name) {
+    const value = pairs[name];
+    if (!value)
+        throw missing(`merge: --${name} is required`);
+    return value;
+}
+async function runMergeCommand(argv, flags) {
+    const pairs = (0, output_ts_1.parsePairs)(argv);
+    const step = required(pairs, 'step');
+    if (step !== 'detach' && step !== 'reinstall') {
+        throw missing("merge: --step must be 'detach' or 'reinstall'");
+    }
+    const ruleId = Number(required(pairs, 'rule-id'));
+    if (!Number.isInteger(ruleId) || ruleId < 0) {
+        throw missing('merge: --rule-id must be a non-negative integer');
+    }
+    const res = await (0, run_1.runMergePolicy)({
+        smartAccount: required(pairs, 'smart-account'),
+        sourceAccount: required(pairs, 'source-account'),
+        ruleId,
+        incomingPredicateBlobBase64: required(pairs, 'predicate'),
+        step,
+        ...(pairs.network ? { network: pairs.network } : {}),
+        ...(pairs['rpc-url'] ? { rpcUrl: pairs['rpc-url'] } : {}),
+        ...(pairs['allow-unpinned-rpc-url'] === 'true' ? { allowUnpinnedRpcUrl: true } : {}),
+    });
+    return (0, output_ts_1.formatToolResponse)(res, flags);
+}

package/dist-cjs/src/index.d.ts

@@ -1,3 +1,4 @@
+export { runMergeCommand } from './commands/merge.ts';
 export { runRecordCommand } from './commands/record.ts';
 export { runSynthesizeCommand } from './commands/synthesize.ts';
 export { formatToolResponse, readJsonFile, writeJsonFile } from './output.ts';

package/dist-cjs/src/index.js

@@ -1,7 +1,9 @@
 "use strict";
 // packages/policy-builder-cli/src/index.ts - public re-exports for the CLI package.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeJsonFile = exports.readJsonFile = exports.formatToolResponse = exports.runSynthesizeCommand = exports.runRecordCommand = void 0;
+exports.writeJsonFile = exports.readJsonFile = exports.formatToolResponse = exports.runSynthesizeCommand = exports.runRecordCommand = exports.runMergeCommand = void 0;
+var merge_ts_1 = require("./commands/merge.js");
+Object.defineProperty(exports, "runMergeCommand", { enumerable: true, get: function () { return merge_ts_1.runMergeCommand; } });
 var record_ts_1 = require("./commands/record.js");
 Object.defineProperty(exports, "runRecordCommand", { enumerable: true, get: function () { return record_ts_1.runRecordCommand; } });
 var synthesize_ts_1 = require("./commands/synthesize.js");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crediolabs/policy-builder-cli",
-  "version": "0.1.18",
+  "version": "0.2.0",
   "license": "MIT",
   "description": "CLI wrapper around the OZ policy-synth core (record + synthesize) for solo-dev and CI workflows.",
   "type": "module",
@@ -63,7 +63,7 @@
     "prepack": "bun run build"
   },
   "dependencies": {
-    "@crediolabs/policy-synth": "0.1.18",
+    "@crediolabs/policy-synth": "0.2.0",
     "@stellar/stellar-sdk": "14.4.0",
     "zod": "3.25.76"
   },

package/src/commands/merge.ts

@@ -0,0 +1,65 @@
+// packages/policy-builder-cli/src/commands/merge.ts
+//
+// `policy-builder merge` subcommand. The tightening remedy for a cross-rule
+// authority overlap.
+//
+// OpenZeppelin enforces only the policies of the context rule a signer NAMES,
+// so a signer in several rules picks which one applies and their authority is
+// the maximum over the matching rules. Adding a second, tighter rule therefore
+// restricts nothing. To actually tighten, the restriction has to become ONE
+// predicate: the conjunction of the installed one and the new one.
+//
+// Two transactions, in order, because `add_policy` refuses a policy already
+// attached to the rule:
+//
+//   policy-builder merge --step detach    ...  sign and submit, wait
+//   policy-builder merge --step reinstall ...  sign and submit
+//
+// The detach uninstalls the policy, which resets every counter on the rule and
+// leaves it unpoliced until the reinstall confirms. Both are reported as
+// warnings rather than left for the operator to discover afterwards.
+
+import { runMergePolicy } from '@crediolabs/policy-synth/run'
+import { CliError, type CliFlags, formatToolResponse, parsePairs } from '../output.ts'
+
+function missing(message: string): CliError {
+  return new CliError({
+    code: 'CLI_MISSING_ARG',
+    message,
+    severity: 'error',
+    retryable: false,
+  })
+}
+
+function required(pairs: Record<string, string>, name: string): string {
+  const value = pairs[name]
+  if (!value) throw missing(`merge: --${name} is required`)
+  return value
+}
+
+export async function runMergeCommand(argv: ReadonlyArray<string>, flags: CliFlags) {
+  const pairs = parsePairs(argv)
+
+  const step = required(pairs, 'step')
+  if (step !== 'detach' && step !== 'reinstall') {
+    throw missing("merge: --step must be 'detach' or 'reinstall'")
+  }
+
+  const ruleId = Number(required(pairs, 'rule-id'))
+  if (!Number.isInteger(ruleId) || ruleId < 0) {
+    throw missing('merge: --rule-id must be a non-negative integer')
+  }
+
+  const res = await runMergePolicy({
+    smartAccount: required(pairs, 'smart-account'),
+    sourceAccount: required(pairs, 'source-account'),
+    ruleId,
+    incomingPredicateBlobBase64: required(pairs, 'predicate'),
+    step,
+    ...(pairs.network ? { network: pairs.network } : {}),
+    ...(pairs['rpc-url'] ? { rpcUrl: pairs['rpc-url'] } : {}),
+    ...(pairs['allow-unpinned-rpc-url'] === 'true' ? { allowUnpinnedRpcUrl: true } : {}),
+  })
+
+  return formatToolResponse(res, flags)
+}

package/src/index.ts

@@ -1,5 +1,6 @@
 // packages/policy-builder-cli/src/index.ts - public re-exports for the CLI package.
 
+export { runMergeCommand } from './commands/merge.ts'
 export { runRecordCommand } from './commands/record.ts'
 export { runSynthesizeCommand } from './commands/synthesize.ts'
 export { formatToolResponse, readJsonFile, writeJsonFile } from './output.ts'