@cnwenf/occ 2.1.302 → 2.1.303

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env bun
-globalThis.MACRO={"VERSION":"2.1.302","BINARY_NAME":"occ","BUILD_TIME":"2026-08-15T18:40:50.843Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
+globalThis.MACRO={"VERSION":"2.1.303","BINARY_NAME":"occ","BUILD_TIME":"2026-08-16T18:17:52.609Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
 // @bun
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
@@ -230980,7 +230980,7 @@ function substituteUserConfigVariables(value, userConfig) {
     return String(configValue);
   });
 }
-function substituteUserConfigInContent(content, options, schema) {
+function substituteUserConfigInContent(content, options, schema, valueTransform) {
   return content.replace(/\$\{user_config\.([^}]+)\}/g, (match, key2) => {
     if (schema[key2]?.sensitive === true) {
       return `[sensitive option '${key2}' not available in skill content]`;
@@ -230989,7 +230989,7 @@ function substituteUserConfigInContent(content, options, schema) {
     if (value === undefined) {
       return match;
     }
-    return String(value);
+    return valueTransform ? valueTransform(String(value)) : String(value);
   });
 }
 var loadPluginOptions;
@@ -607154,14 +607154,15 @@ function generateProgressiveArgumentHint(argNames, typedArgs) {
     return;
   return remaining.map((name3) => `[${name3}]`).join(" ");
 }
-function substituteArguments(content, args, appendIfNoPlaceholder = true, argumentNames = []) {
+function substituteArguments(content, args, appendIfNoPlaceholder = true, argumentNames = [], valueTransform) {
   if (args === undefined || args === null) {
     return content;
   }
   let work = content.replaceAll(SHIELDED_DOLLAR, SENTINEL_REPLACEMENT).replaceAll(VALUE_BOUNDARY, SENTINEL_REPLACEMENT);
   const insertValue = (value) => {
     const sanitized = (value ?? "").replaceAll(SHIELDED_DOLLAR, SENTINEL_REPLACEMENT).replaceAll(VALUE_BOUNDARY, SENTINEL_REPLACEMENT);
-    return VALUE_BOUNDARY + sanitized.replaceAll("$", SHIELDED_DOLLAR) + VALUE_BOUNDARY;
+    const transformed = valueTransform ? valueTransform(sanitized) : sanitized;
+    return VALUE_BOUNDARY + transformed.replaceAll("$", SHIELDED_DOLLAR) + VALUE_BOUNDARY;
   };
   const parsedArgs = parseArguments2(args);
   const namedArgs = argumentNames.map((name3, index2) => ({ name: name3, index: index2 })).filter((entry) => Boolean(entry.name)).sort((left2, right2) => right2.name.length - left2.name.length);
@@ -607212,6 +607213,15 @@ var init_argumentSubstitution = __esm(() => {
 
 // src/utils/promptShellExecution.ts
 import { randomUUID as randomUUID30 } from "crypto";
+function escapeShellExecutionMarkers(value) {
+  return value.replace(/`!/g, "` !").replace(/!`/g, "! `").replace(/(^|\s)!/gm, "$1\\!");
+}
+function escapeAngleBrackets(value) {
+  return value.replaceAll("<", "&lt;").replaceAll(">", "&gt;");
+}
+function sanitizeUsername(value) {
+  return value.replace(/[^a-zA-Z0-9._-]/g, "");
+}
 function isSkillShellExecutionDisabled() {
   if (getSettingsForSource("policySettings")?.disableSkillShellExecution === true) {
     return true;
@@ -607543,7 +607553,7 @@ function createSkillCommand({
       let finalContent = baseDir ? `Base directory for this skill: ${baseDir}
 
 ${markdownContent}` : markdownContent;
-      finalContent = substituteArguments(finalContent, args, true, argumentNames);
+      finalContent = substituteArguments(finalContent, args, true, argumentNames, loadedFrom === "mcp" ? (value) => escapeAngleBrackets(escapeShellExecutionMarkers(value)) : escapeShellExecutionMarkers);
       if (baseDir) {
         const skillDir = process.platform === "win32" ? baseDir.replace(/\\/g, "/") : baseDir;
         finalContent = finalContent.replace(/\$\{CLAUDE_SKILL_DIR\}/g, skillDir);
@@ -608299,13 +608309,13 @@ function createPluginCommand(commandName, file2, sourceName, pluginManifest, plu
         let finalContent = config7.isSkillMode ? `Base directory for this skill: ${dirname51(file2.filePath)}
 
 ${content}` : content;
-        finalContent = substituteArguments(finalContent, args, true, argumentNames);
+        finalContent = substituteArguments(finalContent, args, true, argumentNames, escapeShellExecutionMarkers);
         finalContent = substitutePluginVariables(finalContent, {
           path: pluginPath,
           source: sourceName
         });
         if (pluginManifest.userConfig) {
-          finalContent = substituteUserConfigInContent(finalContent, loadPluginOptions(sourceName), pluginManifest.userConfig);
+          finalContent = substituteUserConfigInContent(finalContent, loadPluginOptions(sourceName), pluginManifest.userConfig, escapeShellExecutionMarkers);
         }
         if (config7.isSkillMode) {
           const rawSkillDir = dirname51(file2.filePath);
@@ -644881,7 +644891,8 @@ var init_color3 = __esm(() => {
 
 // src/commands/commit.ts
 function getPromptContent() {
-  const { commit: commitAttribution } = getAttributionTexts();
+  const { commit: rawCommitAttribution } = getAttributionTexts();
+  const commitAttribution = escapeShellExecutionMarkers(rawCommitAttribution);
   let prefix = "";
   if (process.env.USER_TYPE === "ant" && isUndercover()) {
     prefix = getUndercoverInstructions() + `
@@ -645881,10 +645892,11 @@ var init_desktop2 = __esm(() => {
 
 // src/commands/commit-push-pr.ts
 function getPromptContent2(defaultBranch, prAttribution) {
-  const { commit: commitAttribution, pr: defaultPrAttribution } = getAttributionTexts();
-  const effectivePrAttribution = prAttribution ?? defaultPrAttribution;
-  const safeUser = process.env.SAFEUSER || "";
-  const username = process.env.USER || "";
+  const { commit: rawCommitAttribution, pr: defaultPrAttribution } = getAttributionTexts();
+  const commitAttribution = escapeShellExecutionMarkers(rawCommitAttribution);
+  const effectivePrAttribution = escapeShellExecutionMarkers(prAttribution ?? defaultPrAttribution);
+  const safeUser = sanitizeUsername(process.env.SAFEUSER || "");
+  const username = sanitizeUsername(process.env.USER || "");
   let prefix = "";
   let reviewerArg = " and `--reviewer anthropics/claude-code`";
   let addReviewerArg = " (and add `--add-reviewer anthropics/claude-code`)";
@@ -646002,7 +646014,7 @@ var init_commit_push_pr = __esm(() => {
 
 ## Additional instructions from user
 
-${trimmedArgs}`;
+${escapeShellExecutionMarkers(trimmedArgs)}`;
       }
       const finalContent = await executeShellCommandsInPrompt(promptContent, {
         ...context7,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cnwenf/occ",
-  "version": "2.1.302",
+  "version": "2.1.303",
   "license": "MIT",
   "type": "module",
   "bin": {