nolo-cli 0.191.0-alpha.3 → 0.191.0

package/{chunk-5EFNSNAV.js → chunk-6CFXWUYE.js}

@@ -7,13 +7,13 @@ import {
   deleteDialog,
   runtime_default,
   toast
-} from "./chunk-YE6A72XL.js";
+} from "./chunk-JI5MQU5B.js";
 import {
   UNCATEGORIZED_ID,
   addContentAction,
   checkSpaceMembership,
   localSpaceAuthorityPatchStamp
-} from "./chunk-B6EZB6DW.js";
+} from "./chunk-QAYCF4CH.js";
 import {
   createSpaceKey,
   normalizeSpaceId
@@ -32,7 +32,7 @@ import {
   uploadFileAction,
   upsertSSREntity,
   write
-} from "./chunk-B2N5GZBU.js";
+} from "./chunk-OHYCQKPW.js";
 import {
   resolveFileCategory
 } from "./chunk-3PVYUPXK.js";
@@ -43,10 +43,10 @@ import {
   resolveReplicationServers,
   scheduleDeleteReplication,
   scheduleWriteReplication
-} from "./chunk-7UODCAWW.js";
+} from "./chunk-32GANJHJ.js";
 import {
   createAsyncThunk
-} from "./chunk-WRCZXJ4N.js";
+} from "./chunk-X4F26D5K.js";
 import {
   getIsDesktopApp
 } from "./chunk-6Q7UTJKR.js";
@@ -1497,11 +1497,11 @@ var ENTITY_DELETE_STRATEGIES = {
     await dispatch(deleteTable({ dbKey: key })).unwrap();
   },
   file: async (key, { thunkAPI }) => {
-    const { deleteFileAction } = await import("./deleteFile-R5OBP7OM.js");
+    const { deleteFileAction } = await import("./deleteFile-CE24BROO.js");
     await deleteFileAction(key, thunkAPI);
   },
   image: async (key, { thunkAPI }) => {
-    const { deleteFileAction } = await import("./deleteFile-R5OBP7OM.js");
+    const { deleteFileAction } = await import("./deleteFile-CE24BROO.js");
     await deleteFileAction(key, thunkAPI);
   },
   agent: async (key, { dispatch, userId, sourceServerOrigin }) => {

package/{chunk-6XIE5ZGI.js → chunk-6HIGYUBQ.js}

@@ -1,6 +1,6 @@
 import {
   buildSkillDocMarkdown
-} from "./chunk-AETZ7AD6.js";
+} from "./chunk-EY7V7REW.js";
 
 // packages/cli/docPageHelpers.ts
 import { readFileSync } from "node:fs";

package/{chunk-LBXUNNDS.js → chunk-6K2AKJAD.js}

@@ -7,7 +7,7 @@ import {
   scheduleExistingRecordReplication,
   shouldReplaceLocalWithRemoteRecord,
   shouldReplicateLocalRecord
-} from "./chunk-7UODCAWW.js";
+} from "./chunk-32GANJHJ.js";
 import {
   fetchFromClientDb,
   fetchFromServer,

package/{chunk-U5ZHUOLT.js → chunk-6OBTQSJ2.js}

@@ -5,10 +5,10 @@ import {
 } from "./chunk-NBTY7YJF.js";
 import {
   resolveCliLocalRuntimeKeyCapability
-} from "./chunk-LHOR5MC2.js";
+} from "./chunk-4KYV2TAI.js";
 import {
   HIGH_RISK_MUTATION_TOOL_NAMES
-} from "./chunk-UBLITLAZ.js";
+} from "./chunk-K2GL335R.js";
 import {
   DEFAULT_NOLO_SERVER_URL
 } from "./chunk-OLZBQWZU.js";

package/{chunk-XPL63OIC.js → chunk-7SUYSFPG.js}

@@ -5,7 +5,7 @@ import {
   refreshOpenAiCodexToken,
   resolveServerSyncConfig,
   xaiRefresh
-} from "./chunk-DYQXB46J.js";
+} from "./chunk-ZSCIGIJS.js";
 import {
   defaultLoopbackRequest
 } from "./chunk-VP3BINY7.js";
@@ -15,11 +15,11 @@ import {
   readCredentialEntry,
   readEffectiveCredentialEntry,
   recordCredentialProbe
-} from "./chunk-R4BMKAR5.js";
+} from "./chunk-HAB2UDLT.js";
 import {
   OAUTH_PROVIDER_REFS,
   buildLocalAgentLookupKeys
-} from "./chunk-RJ3EYB5G.js";
+} from "./chunk-PRIROPK4.js";
 import {
   LOCAL_CODEX_AGENT_ID,
   LOCAL_CODEX_AGENT_KEY,
@@ -45,7 +45,7 @@ import {
 } from "./chunk-7JWW65DU.js";
 import {
   applyPublicAgentCatalogOverride
-} from "./chunk-GTP6VNWH.js";
+} from "./chunk-RQ22OZD7.js";
 import {
   CliProviderQuotaError,
   executeCli,
@@ -55,12 +55,13 @@ import {
   buildCliPrompt
 } from "./chunk-ATNTHIZI.js";
 import {
-  inferCaptureIntent
-} from "./chunk-INFHX73M.js";
+  inferCaptureIntent,
+  resolveUserSkillRuntime
+} from "./chunk-MR6L6U46.js";
 import {
   inlineImageUrlsForCustomProvider,
   prepareTools
-} from "./chunk-LCSAJ5TJ.js";
+} from "./chunk-UDKNC3CV.js";
 import {
   getServerProviderSecret
 } from "./chunk-HS7MLR74.js";
@@ -82,7 +83,7 @@ import {
   resolveCliLocalRuntimeKeyCapability,
   resolveCliLocalSpawnDispatch,
   resolveStartAgentRunCwd
-} from "./chunk-LHOR5MC2.js";
+} from "./chunk-4KYV2TAI.js";
 import {
   fetchWithTransientRetry,
   isTransientFetchError
@@ -90,10 +91,11 @@ import {
 import {
   deriveCredentialGroup,
   deriveCustomProviderCredentialGroup
-} from "./chunk-53RSTB7T.js";
+} from "./chunk-7TMVGMM3.js";
 import {
-  resolveAgentRequiredPackIds
-} from "./chunk-3NPXGNSK.js";
+  resolveAgentRequiredPackIds,
+  resolveUserEnabledSkills
+} from "./chunk-CMTTXP5Y.js";
 import {
   applyBuiltinAgentRuntimeOverride,
   applyTokenUsageToDayStats,
@@ -102,14 +104,14 @@ import {
   resolveBuiltinPlatformAgentConfig,
   runKeyed,
   validateAskChoiceInput
-} from "./chunk-YE6A72XL.js";
+} from "./chunk-JI5MQU5B.js";
 import {
   BUILTIN_DIALOG_LLM_CHAT_FALLBACK_MODEL,
   BUILTIN_TITLE_LLM_CONFIG
 } from "./chunk-523DITKR.js";
 import {
   fetchServerSyncedCredential
-} from "./chunk-CTPFBJAF.js";
+} from "./chunk-N7IBYQEC.js";
 import {
   getDefaultCliLocalRuntimeDb
 } from "./chunk-P64WRQYV.js";
@@ -125,7 +127,7 @@ import {
   applySystemBuiltinSkillFilter,
   expandEnabledPacks,
   resolveEffectiveEnabledPacks
-} from "./chunk-SM56M7N7.js";
+} from "./chunk-DBRXPVWY.js";
 import {
   DEFAULT_HYBRID_READ_TIMEOUT_MS,
   Duration_exports,
@@ -169,7 +171,7 @@ import {
   runExecShellGates,
   validateConfiguredRootExecutionLease,
   verifyOwnerRouteAck
-} from "./chunk-ADTJJVDJ.js";
+} from "./chunk-DXDG4XLD.js";
 import {
   accumulateGeminiChunks,
   buildGeminiGenerateContentRequest,
@@ -181,7 +183,7 @@ import {
   resolveAntigravityFinishReason,
   resolveGeminiModelQuirks,
   shouldUseGeminiNativeToolRoute
-} from "./chunk-IIX6VWLW.js";
+} from "./chunk-AV6IE6NM.js";
 import {
   PlatformStreamInterruptedError,
   buildPlatformChatCompletionRequest,
@@ -192,27 +194,27 @@ import {
   readPlatformChatSseCompletion,
   resolvePlatformChatProviderConfig,
   shouldUsePlatformChatProvider
-} from "./chunk-NVOYW6H4.js";
+} from "./chunk-RDKNGJ5M.js";
 import {
   readSseDataValues,
   readSseFrames
 } from "./chunk-HNUWUO75.js";
 import {
   resolveAgentRuntimeConfigFromRecord
-} from "./chunk-N7E3LQ4A.js";
+} from "./chunk-LGW6A7GK.js";
 import {
   resolveHistoricalToolContentCap
 } from "./chunk-2WZXXAQD.js";
 import {
   resolveToolImagePolicy
-} from "./chunk-PVD7CRYV.js";
+} from "./chunk-P7SUBTGZ.js";
 import {
   collectStablePromptPrefix,
   convertMessagesToResponsesInput,
   findAgentStatePairingIssues,
   stablePromptCacheKey,
   toResponsesTools
-} from "./chunk-OHRDHS4N.js";
+} from "./chunk-CVCRAO6Q.js";
 import {
   EMPTY_TOOL_RESULT_TEXT,
   createToolImageBudget,
@@ -228,21 +230,21 @@ import {
   parseNoloWorkspaceToolArguments,
   resolveRequestToolSurface,
   resolveRuntimeToolSurfaceForAgent
-} from "./chunk-UBLITLAZ.js";
+} from "./chunk-K2GL335R.js";
 import {
   isCapacitySaturatedRateLimit,
   mergeAvailabilityDeadline,
   resolveAvailabilityAction,
   resolveCooldownGate,
   resolveCredentialKeyWithFallback
-} from "./chunk-JLR5NWP2.js";
+} from "./chunk-RXX262QX.js";
 import {
   buildDialogFallbackTitleFromUserInput,
   normalizeDialogTitle
 } from "./chunk-2MBTWINN.js";
 import {
   normalizeUsage
-} from "./chunk-K6TZSON4.js";
+} from "./chunk-PXERKNSJ.js";
 import {
   isDevinOAuthAgent
 } from "./chunk-5ZUL4CUO.js";
@@ -294,7 +296,7 @@ import {
 } from "./chunk-LOEO7LRC.js";
 import {
   isAntigravityOAuthAgent
-} from "./chunk-QU3TLYBR.js";
+} from "./chunk-NHI3JZP4.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
@@ -321,7 +323,7 @@ import {
   terminateRunProcess,
   transitionRunToTerminal,
   withQueueLock
-} from "./chunk-BTBT2566.js";
+} from "./chunk-FSEGCTZQ.js";
 import {
   TASK_PREVIEW_MAX,
   formatListRunsCard,
@@ -341,12 +343,12 @@ import {
 import {
   buildProviderSessionHeaders,
   resolvePlatformAuthToken
-} from "./chunk-4YMD7B4Y.js";
+} from "./chunk-WPOKOKZA.js";
 import {
   anthropicOAuthModelMaxOutputTokens,
   findModelConfig,
   isAdaptiveThinkingModelId
-} from "./chunk-GC64WGMD.js";
+} from "./chunk-SM3NSZJV.js";
 import {
   CLI_PROVIDER_VALUES,
   isCliProvider
@@ -378,7 +380,7 @@ import {
 import {
   agentRunCardLabels,
   t
-} from "./chunk-UNOILAZP.js";
+} from "./chunk-M6AGLVV4.js";
 import {
   createTokenDialogIndexKey,
   createTokenKey,
@@ -1104,6 +1106,7 @@ function buildPreparedAgentCacheKey(args) {
   const systemBuiltinSkillsKey = args.systemBuiltinSkills ? JSON.stringify(
     Object.keys(args.systemBuiltinSkills).sort().map((key) => [key, args.systemBuiltinSkills?.[key]])
   ) : "default";
+  const userSkillsKey = JSON.stringify(resolveUserEnabledSkills(args).sort());
   const wakeKey = args.wake !== void 0 ? args.wake ? "wake:1" : "wake:0" : "";
   const policyKey = JSON.stringify([
     args.env?.NOLO_LOCAL_WORKSPACE_TOOLSET ?? "",
@@ -1113,7 +1116,7 @@ function buildPreparedAgentCacheKey(args) {
     args.env?.NOLO_LOCAL_ALLOWED_TOOLS ?? "",
     args.env?.NOLO_LOCAL_ALLOW_UNDECLARED_TOOLS ?? ""
   ]);
-  return `${policyKey}\0${args.userId}\0${args.agentRef}\0${args.cwd}\0${systemBuiltinSkillsKey}${wakeKey ? `\0${wakeKey}` : ""}`;
+  return `${policyKey}\0${args.userId}\0${args.agentRef}\0${args.cwd}\0${systemBuiltinSkillsKey}\0${userSkillsKey}${wakeKey ? `\0${wakeKey}` : ""}`;
 }
 function clearCliLocalRuntimePreparedAgentCache() {
   preparedAgentRuntimeCache.clear();
@@ -2298,7 +2301,7 @@ var resolveCliProviderTransport = async (ctx) => {
         const prompt = buildPromptForCliProvider(messages);
         try {
           const reasoningEffortRaw = agentConfig.reasoning_effort;
-          const reasoningEffort = reasoningEffortRaw === "low" || reasoningEffortRaw === "medium" || reasoningEffortRaw === "high" || reasoningEffortRaw === "xhigh" || reasoningEffortRaw === "max" ? reasoningEffortRaw : void 0;
+          const reasoningEffort = reasoningEffortRaw === "low" || reasoningEffortRaw === "medium" || reasoningEffortRaw === "high" || reasoningEffortRaw === "xhigh" || reasoningEffortRaw === "max" || reasoningEffortRaw === "ultra" ? reasoningEffortRaw : void 0;
           const cliOptions = {
             ...agentConfig.model ? { model: agentConfig.model } : {},
             ...reasoningEffort ? { reasoningEffort } : {},
@@ -2342,6 +2345,41 @@ var resolveCliProviderTransport = async (ctx) => {
 // packages/agent-runtime/codexResponsesProvider.ts
 import { createHash } from "node:crypto";
 import { randomUUID as randomUUID2 } from "node:crypto";
+
+// packages/agent-runtime/codexOAuthModelAliases.ts
+var CODEX_OAUTH_MODEL_ALIASES = {
+  // sol 家族最新：gpt-6.1-sol
+  "gpt-6-sol": {
+    aliasOf: "gpt-6.1-sol",
+    since: "2026-11-01",
+    reason: "\u540C\u5BB6\u65CF\u6362\u4EE3\uFF0Cowner \u51B3\u5B9A\u900F\u660E\u91CD\u5B9A\u5411\uFF08sol \u5BB6\u65CF\u6700\u65B0\u4E3A gpt-6.1-sol\uFF09\u3002"
+  },
+  "gpt-5.6-sol": {
+    aliasOf: "gpt-6.1-sol",
+    since: "2026-11-01",
+    reason: "\u540C\u5BB6\u65CF\u6362\u4EE3\uFF0Cowner \u51B3\u5B9A\u900F\u660E\u91CD\u5B9A\u5411\uFF08sol \u5BB6\u65CF\u6700\u65B0\u4E3A gpt-6.1-sol\uFF09\u3002"
+  },
+  // terra 家族最新：gpt-6.1-terra
+  "gpt-5.6-terra": {
+    aliasOf: "gpt-6.1-terra",
+    since: "2026-11-01",
+    reason: "\u540C\u5BB6\u65CF\u6362\u4EE3\uFF0Cowner \u51B3\u5B9A\u900F\u660E\u91CD\u5B9A\u5411\uFF08terra \u5BB6\u65CF\u6700\u65B0\u4E3A gpt-6.1-terra\uFF09\u3002"
+  },
+  // luna 家族最新：gpt-6-luna（上游无 6.1-luna，luna 家族最新即为 gpt-6-luna）
+  "gpt-5.6-luna": {
+    aliasOf: "gpt-6-luna",
+    since: "2026-11-01",
+    reason: "\u540C\u5BB6\u65CF\u6362\u4EE3\uFF0Cowner \u51B3\u5B9A\u900F\u660E\u91CD\u5B9A\u5411\uFF08luna \u5BB6\u65CF\u6700\u65B0\u4E3A gpt-6-luna\uFF09\u3002"
+  }
+};
+function resolveCodexOAuthEffectiveModel(model) {
+  const raw = asOptionalTrimmedString(model);
+  if (!raw) return void 0;
+  const normalized = raw.toLowerCase();
+  return CODEX_OAUTH_MODEL_ALIASES[normalized]?.aliasOf ?? raw;
+}
+
+// packages/agent-runtime/codexResponsesProvider.ts
 var CODEX_RESPONSES_URL = "https://chatgpt.com/backend-api/codex/responses";
 var CODEX_CLIENT_VERSION = "0.162.1";
 var CODEX_ORIGINATOR = "codex_cli_rs";
@@ -2466,15 +2504,16 @@ function buildCodexRequestBody(args, identity = createCodexRequestIdentity(), se
     const role = m && typeof m === "object" ? String(m.role) : "";
     return role !== "system" && role !== "developer";
   });
+  const rawModel = asOptionalTrimmedString(args.openAiBody.model) ?? asOptionalTrimmedString(args.agentConfig.model) ?? "gpt-5.5";
+  const model = resolveCodexOAuthEffectiveModel(rawModel) ?? rawModel;
   const input = convertMessagesToCodexInput(nonSystem, resolveToolImagePolicy({
     ...args.agentConfig,
-    model: typeof args.openAiBody.model === "string" ? args.openAiBody.model : args.agentConfig.model,
+    model,
     routeKind: "codex/responses",
     legacySupportsToolImages: false
   }));
   const instructions = collectInstructions(rawMessages, args.agentConfig.prompt);
   const stableInstructions = collectStablePromptPrefix(rawMessages, args.agentConfig.prompt);
-  const model = asOptionalTrimmedString(args.openAiBody.model) ?? asOptionalTrimmedString(args.agentConfig.model) ?? "gpt-5.5";
   const tools = toResponsesTools(
     Array.isArray(args.openAiBody.tools) ? args.openAiBody.tools : void 0
   );
@@ -4199,9 +4238,16 @@ async function resolveLocalProvider(ctx) {
   );
 }
 
-// packages/cli/client/localRuntimeAdapter.ts
-import { dirname as dirname4, extname, join as join6 } from "node:path";
+// packages/cli/client/localRuntimePaths.ts
+import { dirname, extname, join } from "node:path";
 import { fileURLToPath } from "node:url";
+function resolveLocalRuntimePaths(moduleUrl, compiled, execPath) {
+  if (compiled) return { cliDir: dirname(execPath), cliEntrypoint: execPath };
+  const modulePath = fileURLToPath(moduleUrl);
+  const extension = extname(modulePath) === ".js" ? ".js" : ".ts";
+  const cliDir = extension === ".js" ? dirname(modulePath) : dirname(dirname(modulePath));
+  return { cliDir, cliEntrypoint: join(cliDir, `index${extension}`) };
+}
 
 // packages/cli/client/localRunExecutionIsolation.ts
 var UNSANDBOXED_HOST_EXECUTION_MESSAGE = "\u672C\u673A\u6267\u884C\u65E0\u6C99\u76D2\u9694\u79BB\uFF0C\u547D\u4EE4\u76F4\u63A5\u4F5C\u7528\u4E8E\u4F60\u7684\u5DE5\u4F5C\u533A";
@@ -5824,7 +5870,7 @@ function deriveAgentRunTodoStatus(input) {
 // packages/cli/client/fileSystemStores.ts
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir as nodeHomedir } from "node:os";
-import { dirname, join } from "node:path";
+import { dirname as dirname2, join as join2 } from "node:path";
 var nodeFs = {
   mkdirSync,
   writeFileSync,
@@ -5836,7 +5882,7 @@ function resolveNoloHome(env, homedir2) {
   if (custom && custom.trim()) return custom.trim();
   const ambient = process.env.NOLO_HOME?.trim();
   if (ambient) return ambient;
-  return join(homedir2(), ".nolo");
+  return join2(homedir2(), ".nolo");
 }
 function ensureDir(dir, fs) {
   fs.mkdirSync(dir, { recursive: true });
@@ -5858,8 +5904,8 @@ function createFileSystemTodoStore(opts = {}) {
   const homedir2 = opts.homedir ?? nodeHomedir;
   const fs = opts.fs ?? nodeFs;
   const noloHome = resolveNoloHome(env, homedir2);
-  const filePath = opts.filePath ?? join(noloHome, "agent_run_todos.json");
-  const oldFilePath = join(noloHome, "todos.json");
+  const filePath = opts.filePath ?? join2(noloHome, "agent_run_todos.json");
+  const oldFilePath = join2(noloHome, "todos.json");
   const loadMap = () => {
     if (!opts.filePath && !fs.existsSync(filePath) && fs.existsSync(oldFilePath)) {
       const oldData = readJson(oldFilePath, fs);
@@ -5884,7 +5930,7 @@ function createFileSystemTodoStore(opts = {}) {
           }
         }
       }
-      ensureDir(dirname(filePath), fs);
+      ensureDir(dirname2(filePath), fs);
       writeJson(filePath, { todos: [...map2.values()] }, fs);
       return map2;
     }
@@ -5898,7 +5944,7 @@ function createFileSystemTodoStore(opts = {}) {
     return map;
   };
   const persist = (map) => {
-    ensureDir(dirname(filePath), fs);
+    ensureDir(dirname2(filePath), fs);
     writeJson(filePath, { todos: [...map.values()] }, fs);
   };
   return {
@@ -8689,7 +8735,7 @@ import {
 } from "node:fs";
 import { access } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { isAbsolute as isAbsolute2, join as join2, relative, resolve as resolve2 } from "node:path";
+import { isAbsolute as isAbsolute2, join as join3, relative, resolve as resolve2 } from "node:path";
 
 // packages/agent-runtime/linuxSandboxSeccomp.ts
 var AUDIT_ARCH_X86_64 = 3221225534;
@@ -8812,8 +8858,8 @@ function openRootHandle(path) {
   }
 }
 function openSeccompFd(program) {
-  const dir = mkdtempSync(join2(tmpdir(), "nolo-bwrap-seccomp-"));
-  const file = join2(dir, "filter.bpf");
+  const dir = mkdtempSync(join3(tmpdir(), "nolo-bwrap-seccomp-"));
+  const file = join3(dir, "filter.bpf");
   let writer = -1;
   let reader = -1;
   try {
@@ -9714,7 +9760,7 @@ import { spawnSync } from "node:child_process";
 import { mkdtempSync as mkdtempSync2, statSync as statSync2, writeFileSync as writeFileSync2 } from "node:fs";
 import { rm } from "node:fs/promises";
 import { tmpdir as tmpdir2 } from "node:os";
-import { join as join3 } from "node:path";
+import { join as join4 } from "node:path";
 var runHostCommand = (argv, { cwd }) => {
   const result = spawnSync(argv[0], argv.slice(1), {
     cwd,
@@ -9774,11 +9820,11 @@ function prepareHostWorkspaceDelivery(args) {
       `\u5DE5\u4F5C\u533A\u6587\u4EF6\u6570 ${tracked.length} \u8D85\u8FC7\u4E0A\u9650 ${MAX_DELIVERY_FILE_COUNT}\uFF1A\u7591\u4F3C\u628A node_modules / \u6784\u5EFA\u4EA7\u7269\u6253\u8FDB\u4E86\u5F52\u6863\uFF08\u5F52\u6863\u53EA\u53D6 git ls-files\uFF09\u3002`
     );
   }
-  const stagingDir = mkdtempSync2(join3(args.tmpDir ?? tmpdir2(), "nolo-workspace-delivery-"));
+  const stagingDir = mkdtempSync2(join4(args.tmpDir ?? tmpdir2(), "nolo-workspace-delivery-"));
   const stamp = `${process.pid}-${Date.now()}`;
-  const archivePath = join3(stagingDir, `workspace-${stamp}.tar.gz`);
-  const bundlePath = join3(stagingDir, `workspace-${stamp}.bundle`);
-  const listPath = join3(stagingDir, `filelist-${stamp}.z`);
+  const archivePath = join4(stagingDir, `workspace-${stamp}.tar.gz`);
+  const bundlePath = join4(stagingDir, `workspace-${stamp}.bundle`);
+  const listPath = join4(stagingDir, `filelist-${stamp}.z`);
   const removeFile = args.removeFile ?? (async (filePath) => {
     await rm(filePath, { force: true });
   });
@@ -10636,7 +10682,7 @@ import { createHash as createHash4, randomUUID as randomUUID3 } from "node:crypt
 // packages/agent-runtime/artifactStore.ts
 import { createHash as createHash3, createHmac } from "node:crypto";
 import { mkdir, readFile, unlink, writeFile } from "node:fs/promises";
-import { dirname as dirname2, resolve as resolve4, sep } from "node:path";
+import { dirname as dirname3, resolve as resolve4, sep } from "node:path";
 var ArtifactStoreError = class extends Error {
   code;
   key;
@@ -10705,7 +10751,7 @@ function createLocalArtifactStore(options) {
       const bytes = toBytes(data);
       const target = pathFor(key);
       try {
-        await mkdir(dirname2(target), { recursive: true });
+        await mkdir(dirname3(target), { recursive: true });
         await writeFile(target, bytes);
       } catch (error) {
         if (error instanceof ArtifactStoreError) throw error;
@@ -11272,7 +11318,7 @@ async function createLocalInstaboxWorkload(args) {
 
 // packages/cli/client/localRunArtifactExport.ts
 import { mkdirSync as mkdirSync2, writeFileSync as writeFileSync3 } from "node:fs";
-import { dirname as dirname3, join as join4 } from "node:path";
+import { dirname as dirname4, join as join5 } from "node:path";
 
 // packages/agent-runtime/runArtifactExport.ts
 var RUN_DIFF_COMMAND = "git add -A && git diff --cached --binary";
@@ -11480,11 +11526,11 @@ function serializeRunArtifactAudit(record) {
 // packages/cli/client/localRunArtifactExport.ts
 function resolveRunArtifactsRootDir(runsDir) {
   const normalized = runsDir.replace(/[/\\]+$/, "");
-  return join4(dirname3(normalized || runsDir), "artifacts");
+  return join5(dirname4(normalized || runsDir), "artifacts");
 }
 function writeRunArtifactAudit(args) {
   const fs = args.fs ?? { mkdirSync: mkdirSync2, writeFileSync: writeFileSync3 };
-  const path = join4(args.runsDir, `${args.record.runId}.artifacts.json`);
+  const path = join5(args.runsDir, `${args.record.runId}.artifacts.json`);
   fs.mkdirSync?.(args.runsDir, { recursive: true });
   fs.writeFileSync(path, serializeRunArtifactAudit(args.record));
   return path;
@@ -11837,7 +11883,7 @@ function buildTokenDialogIndexOps(args) {
 // packages/cli/client/localRuntimeDialog.ts
 import { appendFileSync, mkdirSync as mkdirSync3 } from "fs";
 import { homedir } from "os";
-import { join as join5 } from "path";
+import { join as join6 } from "path";
 var diagLog = {
   warn: (msg) => getLogger("cli.localRuntimeDialog").warn(msg),
   info: (msg) => getLogger("cli.localRuntimeDialog").info(msg)
@@ -11888,11 +11934,11 @@ function projectRawUsage(usage) {
 function debugCaptureRawUsage(item) {
   if (!process.env.NOLO_DEBUG_RAW_USAGE) return;
   try {
-    const noloHome = process.env.NOLO_HOME?.trim() || join5(homedir(), ".nolo");
-    const dir = join5(noloHome, "logs");
+    const noloHome = process.env.NOLO_HOME?.trim() || join6(homedir(), ".nolo");
+    const dir = join6(noloHome, "logs");
     mkdirSync3(dir, { recursive: true });
     appendFileSync(
-      join5(dir, "raw-usage.jsonl"),
+      join6(dir, "raw-usage.jsonl"),
       JSON.stringify({
         ts: Date.now(),
         model: item.model,
@@ -12339,11 +12385,11 @@ function resolveLocalInstaboxToolRoute(args) {
   }
   return { action: "intercept", toolName };
 }
-var currentMetaFile = fileURLToPath(import.meta.url);
-var isJsBundle = extname(currentMetaFile) === ".js";
-var SOURCE_CLI_DIR = isJsBundle ? dirname4(currentMetaFile) : dirname4(dirname4(currentMetaFile));
-var CLI_DIR = isCompiledBinary() ? dirname4(process.execPath) : SOURCE_CLI_DIR;
-var CLI_ENTRYPOINT = isCompiledBinary() ? process.execPath : isJsBundle ? currentMetaFile : join6(SOURCE_CLI_DIR, "index.ts");
+var { cliDir: CLI_DIR, cliEntrypoint: CLI_ENTRYPOINT } = resolveLocalRuntimePaths(
+  import.meta.url,
+  isCompiledBinary(),
+  process.execPath
+);
 var KNOWN_HINT_LABELS = /* @__PURE__ */ new Map([
   ["usage_limit_reached", "usage-limit"],
   ["rate_limit_exceeded", "rate-limit"],
@@ -12676,7 +12722,7 @@ function createCliLocalRuntimeAdapter(deps) {
     emitRunIsolationNotice(fact, { runId });
     try {
       const { writeFileSync: writeFileSync4, mkdirSync: mkdirSync4 } = await import("node:fs");
-      const { resolveRunsDir: resolveRunsDir2 } = await import("./agentRunControl-6HHESKDB.js");
+      const { resolveRunsDir: resolveRunsDir2 } = await import("./agentRunControl-EJPBPVLU.js");
       recordLocalRunExecutionIsolation({
         runId,
         runsDir: resolveRunsDir2(deps.env),
@@ -12701,7 +12747,7 @@ function createCliLocalRuntimeAdapter(deps) {
     dockerWorkloadReleased = true;
     dockerWorkloadLoad = null;
     if (loaded) {
-      const { resolveRunsDir: resolveRunsDir2 } = await import("./agentRunControl-6HHESKDB.js");
+      const { resolveRunsDir: resolveRunsDir2 } = await import("./agentRunControl-EJPBPVLU.js");
       const exportRunDiff = deps.exportDockerRunDiffArtifact ?? exportDockerRunDiffArtifact;
       const warn = (message) => process.stderr.write(`[nolo] ${message}
 `);
@@ -12836,6 +12882,7 @@ function createCliLocalRuntimeAdapter(deps) {
     credentialBroker,
     loadAgentConfig: async (agentRef) => {
       let systemBuiltinSkills = null;
+      let skillPreferences = {};
       const sharedStore = await getOrCreateSharedStore(deps);
       if (userId) {
         try {
@@ -12843,15 +12890,23 @@ function createCliLocalRuntimeAdapter(deps) {
             createUserKey.settings(userId),
             { remote: false }
           );
+          if (settingsRecord && typeof settingsRecord === "object") {
+            skillPreferences = {
+              ...Object.prototype.hasOwnProperty.call(settingsRecord, "enabledSkills") ? { enabledSkills: settingsRecord.enabledSkills } : {},
+              enabledPromptSkills: settingsRecord.enabledPromptSkills
+            };
+          }
           systemBuiltinSkills = settingsRecord && typeof settingsRecord === "object" ? settingsRecord.systemBuiltinSkills ?? null : null;
         } catch {
         }
       }
+      const enabledSkills = resolveUserEnabledSkills(skillPreferences).sort();
       const cacheKey = `${buildPreparedAgentCacheKey({
         userId,
         agentRef,
         cwd: normalizeRuntimeCacheCwd(workspaceRoot),
         systemBuiltinSkills,
+        enabledSkills,
         wake: hasRunWakeChannel(deps.env),
         env: deps.env
       })}:${dockerRuntimeEnabled ? "docker" : instaboxRuntimeEnabled ? "instabox" : "host"}`;
@@ -12868,11 +12923,30 @@ function createCliLocalRuntimeAdapter(deps) {
         userId
       });
       const fallbackLocalCliAgentConfig = storedAgentConfig ? null : resolveBuiltinLocalCliAgentConfig(agentRef, userId);
+      const sourceAgentConfig = storedAgentConfig ?? fallbackLocalCliAgentConfig;
+      const userSkills = await resolveUserSkillRuntime(sourceAgentConfig, {
+        enabledSkills,
+        enabledPromptSkills: skillPreferences.enabledPromptSkills
+      });
       const baseAgentConfig = withResolvedRuntimeToolSurface(
-        storedAgentConfig ?? fallbackLocalCliAgentConfig,
+        sourceAgentConfig && {
+          ...sourceAgentConfig,
+          toolNames: [.../* @__PURE__ */ new Set([
+            ...sourceAgentConfig.toolNames ?? [],
+            ...userSkills.requiredTools
+          ])]
+        },
         deps.env
       );
-      const agentConfig = baseAgentConfig ? withRuntimeEnabledPacksAndPrompt(baseAgentConfig) : baseAgentConfig;
+      const packAgentConfig = baseAgentConfig ? withRuntimeEnabledPacksAndPrompt(baseAgentConfig) : baseAgentConfig;
+      const userPromptPatches = userSkills.skillPromptPatches;
+      const agentConfig = packAgentConfig && userPromptPatches.length ? {
+        ...packAgentConfig,
+        prompt: [
+          packAgentConfig.prompt,
+          ...userPromptPatches.filter((patch) => !String(packAgentConfig.prompt ?? "").includes(patch))
+        ].filter(Boolean).join("\n\n")
+      } : packAgentConfig;
       const requestedToolNames = agentConfig ? resolveCliRequestedToolNames(
         agentConfig,
         deps.env,