@ai-development-environment/control-agent 0.0.90 → 0.0.92

package/dist/control-agent.js

@@ -6172,6 +6172,7 @@ var WORKTREE_OPERATIONS = [
   "PULL",
   "PUSH",
   "RESET",
+  "CLEAR_LOCK",
   "STASH_ALL",
   "STAGE_ALL",
   "UNSTAGE_ALL"
@@ -14355,6 +14356,20 @@ function rootPath(location) {
   }
   return path;
 }
+function isContainedPath(base, candidate) {
+  return candidate === base || candidate.startsWith(`${base}${sep6}`);
+}
+async function resolvedSkillRoot(location) {
+  const root = rootPath(location);
+  const resolvedRoot = await realpath6(root);
+  if (location.scope === "PROJECT") {
+    const resolvedProject = await realpath6(location.folder);
+    if (!isContainedPath(resolvedProject, resolvedRoot)) {
+      throw new Error("Project skill root resolves outside the project folder");
+    }
+  }
+  return { root, resolvedRoot };
+}
 function targetForFolder(targets, folder) {
   return folder ? targets.find((target2) => resolve6(target2.folder) === resolve6(folder)) : void 0;
 }
@@ -14395,14 +14410,15 @@ async function listPackageFiles(skillDirectory) {
   await visit(skillDirectory);
   return files;
 }
-async function readPackage(directory) {
+async function readPackage(directory, resolvedRoot) {
   const metadata = await lstat3(directory);
-  let resolvedDirectory = directory;
-  if (metadata.isSymbolicLink()) {
-    resolvedDirectory = await realpath6(directory);
-  } else if (!metadata.isDirectory()) {
+  if (!metadata.isSymbolicLink() && !metadata.isDirectory()) {
     throw new Error("Skill path is not a directory");
   }
+  const resolvedDirectory = await realpath6(directory);
+  if (!isContainedPath(resolvedRoot, resolvedDirectory)) {
+    throw new Error("Skill package resolves outside its configured root");
+  }
   const files = await listPackageFiles(resolvedDirectory);
   const definition = files.find((file) => file.path === "SKILL.md");
   if (!definition) throw new Error("Skill does not contain SKILL.md");
@@ -14442,6 +14458,15 @@ function consumersForRoot(configured, rootKind, scope) {
 async function scanRoot2(location, configured, targets, warnings) {
   const root = rootPath(location);
   if (!await directoryExists(root)) return [];
+  let resolvedRoot;
+  try {
+    resolvedRoot = (await resolvedSkillRoot(location)).resolvedRoot;
+  } catch (error) {
+    warnings.push(
+      `${root}: ${error instanceof Error ? error.message : String(error)}`
+    );
+    return [];
+  }
   const consumers = consumersForRoot(
     configured,
     location.rootKind,
@@ -14454,7 +14479,7 @@ async function scanRoot2(location, configured, targets, warnings) {
     if (!entry.isDirectory() && !entry.isSymbolicLink()) continue;
     const directory = join9(root, entry.name);
     try {
-      const skillPackage = await readPackage(directory);
+      const skillPackage = await readPackage(directory, resolvedRoot);
       const relativeDirectory = location.folder ? relative6(location.folder, directory).split(sep6).join("/") : "";
       installations.push({
         ...location,
@@ -14529,9 +14554,10 @@ var readSkills = async (payload) => {
     if (!allowed.has(`${request.scope}:${root}`)) {
       throw new Error("Requested skill root is not enabled or configured");
     }
+    const { resolvedRoot } = await resolvedSkillRoot(request);
     packages.push({
       ...request,
-      package: await readPackage(join9(root, request.skillName))
+      package: await readPackage(join9(root, request.skillName), resolvedRoot)
     });
   }
   return { ...successfulProcess6, packages };
@@ -18012,6 +18038,9 @@ var operateWorktree = async (payload, timeoutMs, signal) => {
       await runGit(["clean", "-fd"], "Could not remove untracked files");
       break;
     }
+    case "CLEAR_LOCK":
+      await rm10(join14(input.gitDirectory, "index.lock"), { force: true });
+      break;
     case "STASH_ALL":
       await runGit(["stash", "push", "--include-untracked"], "Stash failed");
       break;
@@ -51216,6 +51245,89 @@ function opencodeQuestionResolution(value) {
   const requestId = data.requestID ?? properties.requestID;
   return typeof requestId === "string" ? requestId : void 0;
 }
+function stringArray3(value) {
+  return Array.isArray(value) ? value.map(String) : [];
+}
+function opencodePermissionRequest(value, fallbackSurface) {
+  const event = asRecord(value);
+  const payload = asRecord(event.payload);
+  const type = String(payload.type ?? event.type ?? "");
+  if (type && type !== "permission.asked" && type !== "permission.v2.asked")
+    return null;
+  const properties = asRecord(payload.properties ?? event.properties);
+  const request = type ? asRecord(
+    properties.request ?? properties.data ?? payload.data ?? event.data ?? properties
+  ) : event;
+  const permission = request.permission ?? request.action;
+  if (typeof permission !== "string") return null;
+  return {
+    id: String(request.id ?? properties.id ?? "permission"),
+    sessionId: typeof request.sessionID === "string" ? request.sessionID : typeof properties.sessionID === "string" ? properties.sessionID : void 0,
+    surface: type === "permission.v2.asked" ? "V2" : fallbackSurface ?? "LEGACY",
+    permission,
+    patterns: stringArray3(request.patterns ?? request.resources),
+    always: stringArray3(request.always ?? request.save)
+  };
+}
+function opencodePermissionResolution(value) {
+  const event = asRecord(value);
+  const payload = asRecord(event.payload);
+  const type = String(payload.type ?? event.type ?? "");
+  if (type !== "permission.replied" && type !== "permission.v2.replied")
+    return void 0;
+  const properties = asRecord(payload.properties ?? event.properties);
+  const data = asRecord(payload.data ?? event.data ?? properties.data);
+  const requestId = data.requestID ?? properties.requestID;
+  return typeof requestId === "string" ? requestId : void 0;
+}
+function permissionQuestions(request) {
+  const permission = request.permission.replaceAll("_", " ");
+  const targets = request.patterns.length ? ` for ${request.patterns.join(", ")}` : "";
+  return [
+    {
+      id: "permission",
+      header: "Permission required",
+      prompt: `OpenCode requests ${permission} permission${targets}.`,
+      multiSelect: false,
+      allowCustom: false,
+      options: [
+        {
+          label: "Allow once",
+          description: "Approve only this request."
+        },
+        ...request.always.length ? [
+          {
+            label: "Always allow",
+            description: `Approve this request and remember ${request.always.join(", ")}.`
+          }
+        ] : [],
+        {
+          label: "Reject",
+          description: "Deny this request and let OpenCode continue safely."
+        }
+      ]
+    }
+  ];
+}
+function permissionReply(value) {
+  const selected = answerArrays(value).flat().map((answer) => answer.trim().toLowerCase()).filter(Boolean);
+  if (selected.length !== 1)
+    throw new Error("Select one response for the OpenCode permission request");
+  switch (selected[0]) {
+    case "allow once":
+    case "once":
+      return "once";
+    case "always allow":
+    case "allow always":
+    case "always":
+      return "always";
+    case "reject":
+    case "deny":
+      return "reject";
+    default:
+      throw new Error(`Unknown OpenCode permission response: ${selected[0]}`);
+  }
+}
 function responseItems(value) {
   const data = resultData(value);
   if (Array.isArray(data)) return data;
@@ -51344,6 +51456,7 @@ var OpenCodeAdapter = class {
     let stopReason = null;
     const streamController = new AbortController();
     const questionSurfaces = /* @__PURE__ */ new Map();
+    const permissionSurfaces = /* @__PURE__ */ new Map();
     const pendingQuestions = /* @__PURE__ */ new Set();
     let sawQuestion = false;
     const reportQuestion = async (request) => {
@@ -51359,6 +51472,19 @@ var OpenCodeAdapter = class {
         throw error;
       }
     };
+    const reportPermission = async (request) => {
+      if (permissionSurfaces.has(request.id)) return;
+      permissionSurfaces.set(request.id, request.surface);
+      pendingQuestions.add(request.id);
+      sawQuestion = true;
+      try {
+        await callbacks.onQuestion(request.id, permissionQuestions(request));
+      } catch (error) {
+        permissionSurfaces.delete(request.id);
+        pendingQuestions.delete(request.id);
+        throw error;
+      }
+    };
     const reconcileLegacyQuestions = async () => {
       const response = await client2.question.list(
         { directory: cwd },
@@ -51381,6 +51507,27 @@ var OpenCodeAdapter = class {
           await reportQuestion(request);
       }
     };
+    const reconcileLegacyPermissions = async () => {
+      const response = await client2.permission.list(
+        { directory: cwd },
+        { signal: AbortSignal.timeout(QUESTION_RECONCILIATION_TIMEOUT_MS) }
+      );
+      for (const value of responseItems(response)) {
+        const request = opencodePermissionRequest(value, "LEGACY");
+        if (request?.sessionId === nativeId) await reportPermission(request);
+      }
+    };
+    const reconcileV2Permissions = async () => {
+      const response = await client2.v2.session.permission.list(
+        { sessionID: nativeId },
+        { signal: AbortSignal.timeout(QUESTION_RECONCILIATION_TIMEOUT_MS) }
+      );
+      for (const value of responseItems(response)) {
+        const request = opencodePermissionRequest(value, "V2");
+        if (request && (!request.sessionId || request.sessionId === nativeId))
+          await reportPermission(request);
+      }
+    };
     const eventTask = (async () => {
       try {
         const subscription = await client2.event.subscribe(
@@ -51391,8 +51538,13 @@ var OpenCodeAdapter = class {
           if (eventSessionId(event) !== nativeId) continue;
           const question = opencodeQuestionRequest(event);
           if (question) await reportQuestion(question);
+          const permission = opencodePermissionRequest(event);
+          if (permission) await reportPermission(permission);
           const resolvedRequestId = opencodeQuestionResolution(event);
           if (resolvedRequestId) pendingQuestions.delete(resolvedRequestId);
+          const resolvedPermissionId = opencodePermissionResolution(event);
+          if (resolvedPermissionId)
+            pendingQuestions.delete(resolvedPermissionId);
           const record = asRecord(event);
           const payload = asRecord(record.payload);
           const type = String(payload.type ?? record.type ?? "event");
@@ -51446,6 +51598,14 @@ var OpenCodeAdapter = class {
       "V2",
       reconcileV2Questions
     );
+    const legacyPermissionReconciliationTask = questionReconciliationTask(
+      "LEGACY permission",
+      reconcileLegacyPermissions
+    );
+    const v2PermissionReconciliationTask = questionReconciliationTask(
+      "V2 permission",
+      reconcileV2Permissions
+    );
     const send = async (prompt, attachments) => {
       const response = await client2.session.prompt({
         sessionID: nativeId,
@@ -51471,7 +51631,9 @@ var OpenCodeAdapter = class {
         let response = await send(input.prompt, input.attachments);
         await Promise.allSettled([
           reconcileLegacyQuestions(),
-          reconcileV2Questions()
+          reconcileV2Questions(),
+          reconcileLegacyPermissions(),
+          reconcileV2Permissions()
         ]);
         while (!stopReason && pendingQuestions.size) {
           await waitForPoll(streamController.signal);
@@ -51518,7 +51680,9 @@ var OpenCodeAdapter = class {
         await Promise.allSettled([
           eventTask,
           legacyQuestionReconciliationTask,
-          v2QuestionReconciliationTask
+          v2QuestionReconciliationTask,
+          legacyPermissionReconciliationTask,
+          v2PermissionReconciliationTask
         ]);
         isolatedRuntime?.server.close();
       }
@@ -51534,7 +51698,20 @@ var OpenCodeAdapter = class {
         await send(prompt, attachments);
       },
       async answer(requestId, answers) {
-        if (questionSurfaces.get(requestId) === "V2") {
+        const permissionSurface = permissionSurfaces.get(requestId);
+        if (permissionSurface === "V2") {
+          await client2.v2.session.permission.reply({
+            sessionID: nativeId,
+            requestID: requestId,
+            reply: permissionReply(answers)
+          });
+        } else if (permissionSurface === "LEGACY") {
+          await client2.permission.reply({
+            requestID: requestId,
+            directory: cwd,
+            reply: permissionReply(answers)
+          });
+        } else if (questionSurfaces.get(requestId) === "V2") {
           await client2.v2.session.question.reply({
             sessionID: nativeId,
             requestID: requestId,
@@ -51548,6 +51725,7 @@ var OpenCodeAdapter = class {
           });
         }
         pendingQuestions.delete(requestId);
+        permissionSurfaces.delete(requestId);
       }
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-development-environment/control-agent",
-  "version": "0.0.90",
+  "version": "0.0.92",
   "description": "Control agent for the AI Development Environment",
   "license": "MIT",
   "repository": {