toolcraft 0.0.26 → 0.0.27

package/dist/error-report.js

@@ -116,6 +116,25 @@ function redactValue(value) {
     }
     return `<set, ${value.length} chars>`;
 }
+function collectStringLeaves(value, output) {
+    if (typeof value === "string") {
+        if (value.length > 0) {
+            output.add(value);
+        }
+        return;
+    }
+    if (Array.isArray(value)) {
+        for (const entry of value) {
+            collectStringLeaves(entry, output);
+        }
+        return;
+    }
+    if (isPlainObject(value)) {
+        for (const entry of Object.values(value)) {
+            collectStringLeaves(entry, output);
+        }
+    }
+}
 function schemaSecretValue(schema) {
     const unwrapped = unwrapOptional(schema);
     if (unwrapped.kind === "string" || unwrapped.kind === "number") {
@@ -155,6 +174,52 @@ function redactParams(params, command) {
     }
     return redactParamsValue(params, command.params, "");
 }
+function collectSensitiveParamValues(value, schema, name, output) {
+    if (shouldRedactParam(name, schema)) {
+        collectStringLeaves(value, output);
+        return;
+    }
+    const unwrapped = unwrapOptional(schema);
+    if (unwrapped.kind === "object" && isPlainObject(value)) {
+        for (const [key, childValue] of Object.entries(value)) {
+            const childSchema = unwrapped.shape[key];
+            if (childSchema !== undefined) {
+                collectSensitiveParamValues(childValue, childSchema, key, output);
+            }
+        }
+        return;
+    }
+    if (unwrapped.kind === "array" && Array.isArray(value)) {
+        for (const entry of value) {
+            collectSensitiveParamValues(entry, unwrapped.item, name, output);
+        }
+    }
+}
+function createReportStringRedactor(context, env) {
+    const values = new Set();
+    for (const value of Object.values(context.secrets ?? {})) {
+        if (value !== undefined && value.length > 0) {
+            values.add(value);
+        }
+    }
+    for (const [name, secret] of Object.entries(context.command?.secrets ?? {})) {
+        const value = context.secrets?.[name] ?? env[secret.env];
+        if (value !== undefined && value.length > 0) {
+            values.add(value);
+        }
+    }
+    if (context.command !== undefined) {
+        collectSensitiveParamValues(context.params, context.command.params, "", values);
+    }
+    const orderedValues = [...values].sort((left, right) => right.length - left.length);
+    return (value) => {
+        let redacted = value;
+        for (const secretValue of orderedValues) {
+            redacted = redacted.split(secretValue).join("<redacted>");
+        }
+        return redacted;
+    };
+}
 function commandSecretEnvNames(secrets) {
     if (secrets === undefined) {
         return [];
@@ -203,7 +268,7 @@ function redactArgv(argv, options) {
 function stableJson(value) {
     return JSON.stringify(value, null, 2) ?? "undefined";
 }
-function redactStructuredErrorField(name, value) {
+function redactStructuredErrorField(name, value, redactString) {
     if (typeof value === "string") {
         const redactedHeaderValue = redactHttpHeaderValue(name, value);
         if (redactedHeaderValue !== value) {
@@ -212,23 +277,27 @@ function redactStructuredErrorField(name, value) {
         if (isSensitiveName(name)) {
             return "<redacted>";
         }
+        return redactString(value);
     }
     if (Array.isArray(value)) {
-        return value.map((entry) => redactStructuredErrorField(name, entry));
+        return value.map((entry) => redactStructuredErrorField(name, entry, redactString));
     }
     if (isPlainObject(value)) {
-        return Object.fromEntries(Object.entries(value).map(([key, entry]) => [key, redactStructuredErrorField(key, entry)]));
+        return Object.fromEntries(Object.entries(value).map(([key, entry]) => [
+            key,
+            redactStructuredErrorField(key, entry, redactString)
+        ]));
     }
     return value;
 }
-function ownStructuredFields(error) {
+function ownStructuredFields(error, redactString) {
     const fields = {};
     for (const key of Object.keys(error)) {
         if (key === "name" || key === "message" || key === "stack" || key === "cause") {
             continue;
         }
         Object.defineProperty(fields, key, {
-            value: redactStructuredErrorField(key, error[key]),
+            value: redactStructuredErrorField(key, error[key], redactString),
             enumerable: true,
             configurable: true,
             writable: true
@@ -236,47 +305,47 @@ function ownStructuredFields(error) {
     }
     return fields;
 }
-function formatStackChain(error) {
+function formatStackChain(error, redactString) {
     const lines = [];
     let current = error;
     let index = 0;
     while (current !== undefined) {
         if (current instanceof Error) {
-            lines.push(index === 0
-                ? (current.stack ?? String(current))
-                : `Caused by: ${current.stack ?? String(current)}`);
+            const stack = current.stack ?? String(current);
+            lines.push(redactString(index === 0 ? stack : `Caused by: ${stack}`));
             current = current.cause;
         }
         else {
-            lines.push(index === 0 ? String(current) : `Caused by: ${String(current)}`);
+            const message = String(current);
+            lines.push(redactString(index === 0 ? message : `Caused by: ${message}`));
             current = undefined;
         }
         index += 1;
     }
     return lines.join("\n");
 }
-function formatHeaderValue(name, value) {
-    return redactHttpHeaderValue(name, value);
+function formatHeaderValue(name, value, redactString) {
+    return redactString(redactHttpHeaderValue(name, value));
 }
-function formatHeaders(headers) {
+function formatHeaders(headers, redactString) {
     return Object.entries(headers)
-        .map(([name, value]) => `${name}: ${formatHeaderValue(name, value)}`)
+        .map(([name, value]) => `${name}: ${formatHeaderValue(name, value, redactString)}`)
         .join("\n");
 }
-function formatBody(body) {
+function formatBody(body, redactString) {
     const redactedBody = redactHttpBody(body);
     if (typeof redactedBody === "string") {
-        return redactedBody;
+        return redactString(redactedBody);
     }
-    return stableJson(redactedBody);
+    return redactString(stableJson(redactedBody));
 }
-function formatHttpTranscript(error) {
+function formatHttpTranscript(error, redactString) {
     const requestLines = [
         `${error.request.method} ${error.request.url}`,
-        formatHeaders(error.request.headers)
+        formatHeaders(error.request.headers, redactString)
     ].filter((line) => line.length > 0);
     if (error.request.body !== undefined) {
-        requestLines.push("", formatBody(error.request.body));
+        requestLines.push("", formatBody(error.request.body, redactString));
     }
     return [
         "Request:",
@@ -284,9 +353,9 @@ function formatHttpTranscript(error) {
         "",
         "Response:",
         `${error.response.status} ${error.response.statusText}`,
-        formatHeaders(error.response.headers),
+        formatHeaders(error.response.headers, redactString),
         "",
-        formatBody(error.response.body)
+        formatBody(error.response.body, redactString)
     ].join("\n");
 }
 function resolveToolcraftVersion(version) {
@@ -297,9 +366,10 @@ function resolveToolcraftVersion(version) {
 function buildReport(context) {
     const env = context.env ?? process.env;
     const error = context.error;
+    const redactString = createReportStringRedactor(context, env);
     const errorName = error instanceof Error ? error.name : typeof error;
-    const errorMessage = error instanceof Error ? error.message : String(error);
-    const structuredFields = error instanceof Error ? ownStructuredFields(error) : {};
+    const errorMessage = redactString(error instanceof Error ? error.message : String(error));
+    const structuredFields = error instanceof Error ? ownStructuredFields(error, redactString) : {};
     const secretLines = Object.entries(context.command?.secrets ?? {}).map(([name, secret]) => {
         const value = context.secrets?.[name] ?? env[secret.env];
         return `${secret.env}=${redactValue(value)}`;
@@ -313,7 +383,7 @@ function buildReport(context) {
         `platform: ${process.platform} ${process.arch}`,
         "",
         "Argv",
-        stableJson(redactArgv(context.argv, { command: context.command, secrets: context.secrets })),
+        redactString(stableJson(redactArgv(context.argv, { command: context.command, secrets: context.secrets }))),
         "",
         "Resolved Secrets",
         ...(secretLines.length === 0 ? ["<none>"] : secretLines),
@@ -324,19 +394,19 @@ function buildReport(context) {
             : context.commandPath,
         "",
         "Parsed Params",
-        stableJson(redactParams(context.params, context.command)),
+        redactString(stableJson(redactParams(context.params, context.command))),
         "",
         "Error",
         `name: ${errorName}`,
         `message: ${errorMessage}`,
         "structured fields:",
-        stableJson(structuredFields),
+        redactString(stableJson(structuredFields)),
         "",
         "Stack",
-        formatStackChain(error)
+        formatStackChain(error, redactString)
     ];
     if (hasHttpContext(error)) {
-        lines.push("", "HTTP Transcript", formatHttpTranscript(error));
+        lines.push("", "HTTP Transcript", formatHttpTranscript(error, redactString));
     }
     return `${lines.join("\n")}\n`;
 }

package/node_modules/@poe-code/task-list/dist/backends/gh-issues-sync.js

@@ -126,6 +126,14 @@ function buildVerifyReport(lookup, opts) {
 export async function syncGhProject(opts) {
     const client = resolveGhClient(opts);
     let lookup = await lookupProject(client, opts.owner, opts.number);
+    const initialReport = buildVerifyReport(lookup, opts);
+    if (initialReport.ok || opts.yes !== true) {
+        return {
+            ...initialReport,
+            created: [],
+            updated: []
+        };
+    }
     let resolvedNumber = opts.number;
     const created = [];
     if (lookup.project === null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolcraft",
-  "version": "0.0.26",
+  "version": "0.0.27",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -45,7 +45,7 @@
   "dependencies": {
     "@clack/core": "^1.0.0",
     "@clack/prompts": "^1.0.0",
-    "toolcraft-schema": "0.0.26",
+    "toolcraft-schema": "0.0.27",
     "commander": "^14.0.3",
     "jose": "^6.1.2",
     "jsonc-parser": "^3.3.1",