@thieung/agentkit-helper 0.1.4 → 0.1.5

package/README.md

@@ -91,10 +91,12 @@ akh update --project /path/to/project --dry-run
 
 Targets:
 
-- Install: `claude-code`, `codex`, `cursor`, `dsh`, `grok`, `omp`, `pi`
-- Update: `claude-code`, `codex`, `cursor`, `grok`, `omp`, `pi`
+- Install: `claude-code`, `codex`, `cursor`, `dsh`, `grok`, `omp`, `pi`, `pi-ak`, `pi-omp`
+- Update: `claude-code`, `codex`, `cursor`, `dsh`, `grok`, `omp`, `pi`, `pi-ak`, `pi-omp`
 - Export: `agy`, `portable`
 
+`dsh` updates use `ak kit refresh` because remote `ak update` still rejects that runtime. `pi-ak` and `pi-omp` are global-only profile aliases (`--global`); they install/update into the custom Pi/OMP homes instead of the default `pi`/`omp` directories.
+
 Run `akh --help` for every command and option.
 
 </details>

package/README.vi.md

@@ -88,10 +88,12 @@ akh update --project /path/to/project --dry-run
 
 Các target:
 
-- Cài đặt: `claude-code`, `codex`, `cursor`, `dsh`, `grok`, `omp`, `pi`
-- Cập nhật: `claude-code`, `codex`, `cursor`, `grok`, `omp`, `pi`
+- Cài đặt: `claude-code`, `codex`, `cursor`, `dsh`, `grok`, `omp`, `pi`, `pi-ak`, `pi-omp`
+- Cập nhật: `claude-code`, `codex`, `cursor`, `dsh`, `grok`, `omp`, `pi`, `pi-ak`, `pi-omp`
 - Export: `agy`, `portable`
 
+Update `dsh` đi qua `ak kit refresh` vì `ak update` remote vẫn reject runtime này. `pi-ak` và `pi-omp` là alias profile chỉ dùng với `--global`; chúng cài/cập nhật vào home Pi/OMP custom, không phải thư mục `pi`/`omp` mặc định.
+
 Chạy `akh --help` để xem toàn bộ command và option.
 
 </details>

package/bin/agentkit-helper.mjs

@@ -6,9 +6,10 @@ import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import {
   EXPORT_TARGETS,
-  INSTALL_TARGETS,
+  helperRuntimeTargets,
   KITS,
   parseArgs,
+  specHasProfileTarget,
   splitTargetSpec,
   targetSpecIsSupported,
   UPDATE_TARGETS,
@@ -21,14 +22,17 @@ import {
   globalUpdateApplyArgs,
   globalUpdatePreviewArgs,
   installArgs,
+  kitRefreshArgs,
   projectUpdateApplyArgs,
   projectUpdatePreviewArgs,
   selfUpdateCheckArgs,
   selfUpdateApplyArgs,
   selfUpdateJsonApplyArgs,
   selfUpdateJsonCheckArgs,
-  updateApplyArgs,
-  updatePreviewArgs,
+  splitRuntimesForUpdate,
+  updateApplyArgsForRuntime,
+  updatePreviewArgsForRuntime,
+  usesKitRefresh,
 } from "../lib/commands.mjs";
 import { readProjectConfig, writeProjectConfig } from "../lib/config.mjs";
 import { colorText } from "../lib/colors.mjs";
@@ -48,6 +52,7 @@ import { t } from "../lib/i18n.mjs";
 import { isUnsafeProjectPath, resolveProjectPath } from "../lib/project.mjs";
 import {
   classifyPiProfiles,
+  materializeHelperTarget,
   parsePiProfileInventory,
   piProfileManagerInvocation,
   piProfileProcessOptions,
@@ -140,8 +145,8 @@ Tùy chọn:
   --version, -v          Hiện phiên bản
 
 Target groups:
-  Install                claude-code, codex, cursor, dsh, grok, omp, pi
-  Update                 claude-code, codex, cursor, grok, omp, pi (dsh: unsupported)
+  Install                claude-code, codex, cursor, dsh, grok, omp, pi, pi-ak, pi-omp
+  Update                 claude-code, codex, cursor, dsh, grok, omp, pi, pi-ak, pi-omp
   Export                 agy, portable
 `);
     return;
@@ -177,8 +182,8 @@ Options:
   --version, -v          Show version
 
 Target groups:
-  Install                claude-code, codex, cursor, dsh, grok, omp, pi
-  Update                 claude-code, codex, cursor, grok, omp, pi (dsh: unsupported)
+  Install                claude-code, codex, cursor, dsh, grok, omp, pi, pi-ak, pi-omp
+  Update                 claude-code, codex, cursor, dsh, grok, omp, pi, pi-ak, pi-omp
   Export                 agy, portable
 `);
 }
@@ -369,15 +374,11 @@ async function selectTarget(
   const allRuntimeValue = "__all_runtimes__";
   const choices = [
     { label: ui("allRuntimes"), value: allRuntimeValue },
-    ...[...targets].map((target) => ({ label: target, value: target })),
+    ...[...targets].map((target) => ({
+      label: target === "pi-ak" ? ui("piAkProfile") : target === "pi-omp" ? ui("piOmpProfile") : target,
+      value: target,
+    })),
   ];
-  if (promptKey === "updateTargetPrompt") {
-    choices.push({
-      label: ui("dshUpdateUnsupported"),
-      value: "dsh",
-      disabled: true,
-    });
-  }
   const initialValues = [];
   const selected = await (allowBack ? multiChooseWithBack : multiChoose)(
     ui(promptKey, promptValues),
@@ -468,7 +469,9 @@ async function install(commandOptions, allowBack = false) {
       {
         key: "target",
         select: (values) => selectTarget(
-          commandOptions, config, INSTALL_TARGETS, "targetPrompt", routeCanGoBack, allowBack,
+          commandOptions, config, helperRuntimeTargets({
+            command: "install", global: scope.global,
+          }), "targetPrompt", routeCanGoBack, allowBack,
           { kit: kitName(values.kit) },
         ),
       },
@@ -478,12 +481,16 @@ async function install(commandOptions, allowBack = false) {
     if (!scopeWasPrompted) return BACK;
   }
   const selection = { ...scope, ...route };
+  if (specHasProfileTarget(selection.target) && !selection.global) {
+    throw new Error(ui("profileTargetsNeedGlobal"));
+  }
+  const profiles = specHasProfileTarget(selection.target) ? await loadPiProfilesQuiet() : [];
   const installSelections = splitTargetSpec(selection.target)
-    .map((target) => ({ ...selection, target }));
+    .map((target) => materializeHelperTarget({ ...selection, target }, profiles));
 
   printSection(ui("installPlan"));
   for (const targetSelection of installSelections) {
-    printPlan(installArgs(targetSelection), targetSelection.project);
+    printPlan(installArgs(targetSelection), targetSelection.project, targetSelection.envOverrides);
   }
   if (commandOptions.dryRun) {
     process.stdout.write(`\n${ui("dryRunFiles")}\n`);
@@ -500,12 +507,17 @@ async function install(commandOptions, allowBack = false) {
 
   for (const targetSelection of installSelections) {
     const cwd = targetSelection.project || process.cwd();
+    const runOptions = {
+      cwd,
+      envOverrides: targetSelection.envOverrides,
+      envUnset: targetSelection.envUnset,
+    };
     try {
-      await runAkCommand(installArgs(targetSelection), { cwd });
+      await runAkCommand(installArgs(targetSelection), runOptions);
     } catch (error) {
       if (!requiresForceConsent(error)) throw error;
       warning(ui(targetSelection.global ? "globalForceWarning" : "projectForceWarning", {
-        target: targetSelection.target,
+        target: targetSelection.helperTarget || targetSelection.target,
       }));
       if (!process.stdin.isTTY || !process.stdout.isTTY) {
         error.message = `${error.message}\n${ui("forceNeedsConsent")}`;
@@ -517,8 +529,8 @@ async function install(commandOptions, allowBack = false) {
       }
       const forceArgs = installArgs(targetSelection, { force: true });
       printSection(ui("forceInstallPlan"));
-      printPlan(forceArgs, targetSelection.project);
-      await runAkCommand(forceArgs, { cwd });
+      printPlan(forceArgs, targetSelection.project, targetSelection.envOverrides);
+      await runAkCommand(forceArgs, runOptions);
     }
   }
   if (selection.project && !commandOptions.noSave) {
@@ -691,7 +703,9 @@ async function update(commandOptions, allowBack = false) {
         {
           key: "target",
           select: (values) => selectTarget(
-            commandOptions, config, UPDATE_TARGETS, "updateTargetPrompt", routeCanGoBack, allowBack,
+            commandOptions, config, helperRuntimeTargets({
+              command: "update", global: scope.global,
+            }), "updateTargetPrompt", routeCanGoBack, allowBack,
             { kit: kitName(values.kit) },
           ),
         },
@@ -714,9 +728,13 @@ async function update(commandOptions, allowBack = false) {
     ...scope,
     channel,
   };
-  const updateSelections = selection.global
-    ? [selection]
-    : splitTargetSpec(selection.target).map((target) => ({ ...selection, target }));
+  if (specHasProfileTarget(selection.target) && !selection.global) {
+    throw new Error(ui("profileTargetsNeedGlobal"));
+  }
+  const profiles = specHasProfileTarget(selection.target) ? await loadPiProfilesQuiet() : [];
+  const updateSelections = splitTargetSpec(selection.target).map((target) => (
+    materializeHelperTarget({ ...selection, target }, profiles)
+  ));
   if (selection.global) warning(ui("globalUpdateSafety"));
   if (channel === "beta") {
     const betaBinary = await prepareBetaBinary(commandOptions, { requiresPreview: true });
@@ -726,15 +744,24 @@ async function update(commandOptions, allowBack = false) {
   printSection(ui("updatePreview"));
   for (const targetSelection of updateSelections) {
     if (updateSelections.length > 1) {
-      process.stdout.write(`${colorText(targetSelection.target, "target")}\n`);
+      process.stdout.write(`${colorText(targetSelection.helperTarget, "target")}\n`);
+    }
+    const previewArgs = updatePreviewArgsForRuntime(targetSelection);
+    if (previewArgs) {
+      await runAkCommand(previewArgs, {
+        cwd: targetSelection.project || process.cwd(),
+        envOverrides: targetSelection.envOverrides,
+        envUnset: targetSelection.envUnset,
+      });
     }
-    await runAkCommand(updatePreviewArgs(targetSelection), {
-      cwd: targetSelection.project || process.cwd(),
-    });
   }
   printSection(ui("applyPlan"));
   for (const targetSelection of updateSelections) {
-    printPlan(updateApplyArgs(targetSelection), targetSelection.project);
+    printPlan(
+      updateApplyArgsForRuntime(targetSelection),
+      targetSelection.project,
+      targetSelection.envOverrides,
+    );
   }
   if (commandOptions.dryRun) {
     process.stdout.write(`\n${ui("dryRunFiles")}\n`);
@@ -746,8 +773,10 @@ async function update(commandOptions, allowBack = false) {
   }
 
   for (const targetSelection of updateSelections) {
-    await runAkCommand(updateApplyArgs(targetSelection), {
+    await runAkCommand(updateApplyArgsForRuntime(targetSelection), {
       cwd: targetSelection.project || process.cwd(),
+      envOverrides: targetSelection.envOverrides,
+      envUnset: targetSelection.envUnset,
     });
   }
   if (selection.project && !commandOptions.noSave) {
@@ -756,18 +785,34 @@ async function update(commandOptions, allowBack = false) {
   process.stdout.write(`${ui("updateComplete")}\n`);
 }
 
-function updateAllPreviewArgs(candidate, channel) {
-  if (candidate.kind === "global" || candidate.kind === "profile") {
-    return globalUpdatePreviewArgs(channel, candidate.runtimes, candidate.kit);
+function updateAllCommandPlans(candidate, channel) {
+  const kit = candidate.kit;
+  if (candidate.kind === "project") {
+    if (usesKitRefresh(candidate.runtime)) {
+      return [{ preview: null, apply: kitRefreshArgs({
+        global: false, kit, channel, target: candidate.runtime,
+      }) }];
+    }
+    return [{
+      preview: projectUpdatePreviewArgs(candidate.path, candidate.runtime, channel, kit),
+      apply: projectUpdateApplyArgs(candidate.path, candidate.runtime, channel, kit),
+    }];
+  }
+  const { update, refresh } = splitRuntimesForUpdate(candidate.runtimes);
+  const plans = [];
+  if (update.length > 0) {
+    plans.push({
+      preview: globalUpdatePreviewArgs(channel, update, kit),
+      apply: globalUpdateApplyArgs(channel, update, kit),
+    });
   }
-  return projectUpdatePreviewArgs(candidate.path, candidate.runtime, channel, candidate.kit);
-}
-
-function updateAllApplyArgs(candidate, channel) {
-  if (candidate.kind === "global" || candidate.kind === "profile") {
-    return globalUpdateApplyArgs(channel, candidate.runtimes, candidate.kit);
+  for (const runtime of refresh) {
+    plans.push({
+      preview: null,
+      apply: kitRefreshArgs({ global: true, kit, channel, target: runtime }),
+    });
   }
-  return projectUpdateApplyArgs(candidate.path, candidate.runtime, channel, candidate.kit);
+  return plans;
 }
 
 async function askDeepScanRoots() {
@@ -854,6 +899,18 @@ function orderUpdateCandidates(candidates) {
   return [...candidates].sort((left, right) => priority[left.kind] - priority[right.kind]);
 }
 
+async function loadPiProfilesQuiet() {
+  try {
+    const inventory = await runCapture(piProfileManager.binary, [
+      ...piProfileManager.prefixArgs,
+      "profiles", "list", "--json",
+    ]);
+    return parsePiProfileInventory(inventory.stdout);
+  } catch {
+    return [];
+  }
+}
+
 async function loadUpdateInventory(commandOptions, deepScanRoots) {
   const registry = await withSpinner(
     ui("loadingRegistry"),
@@ -1008,11 +1065,15 @@ async function updateAll(commandOptions, allowBack = false) {
     printSection(ui("updateAllPreview"));
     for (const candidate of selected) {
       process.stdout.write(`\n${colorText(candidate.label, "target")}\n`);
-      await runAkCommand(updateAllPreviewArgs(candidate, channel), candidate);
+      for (const plan of updateAllCommandPlans(candidate, channel)) {
+        if (plan.preview) await runAkCommand(plan.preview, candidate);
+      }
     }
     printSection(ui("updateAllApplyPlan"));
     for (const candidate of selected) {
-      printPlan(updateAllApplyArgs(candidate, channel), null, candidate.envOverrides);
+      for (const plan of updateAllCommandPlans(candidate, channel)) {
+        printPlan(plan.apply, null, candidate.envOverrides);
+      }
     }
     if (commandOptions.dryRun) {
       process.stdout.write(`\n${ui("dryRunFiles")}\n`);
@@ -1028,7 +1089,9 @@ async function updateAll(commandOptions, allowBack = false) {
         total: selected.length,
         label: candidate.label,
       })}\n`);
-      await runAkCommand(updateAllApplyArgs(candidate, channel), candidate);
+      for (const plan of updateAllCommandPlans(candidate, channel)) {
+        await runAkCommand(plan.apply, candidate);
+      }
     }
     process.stdout.write(`${ui("updateAllComplete")}\n`);
     return;

package/lib/args.mjs

@@ -4,10 +4,16 @@ export const COMMANDS = new Set([
 export const INSTALL_TARGETS = new Set([
   "claude-code", "codex", "cursor", "dsh", "grok", "omp", "pi",
 ]);
-export const UPDATE_TARGETS = new Set(["claude-code", "codex", "cursor", "grok", "omp", "pi"]);
+export const UPDATE_TARGETS = new Set([
+  "claude-code", "codex", "cursor", "dsh", "grok", "omp", "pi",
+]);
+export const PROFILE_TARGETS = new Set(["pi-ak", "pi-omp"]);
+export const PROFILE_RUNTIME = { "pi-ak": "pi", "pi-omp": "omp" };
+export const HELPER_INSTALL_TARGETS = new Set([...INSTALL_TARGETS, ...PROFILE_TARGETS]);
+export const HELPER_UPDATE_TARGETS = new Set([...UPDATE_TARGETS, ...PROFILE_TARGETS]);
 export const EXPORT_TARGETS = new Set(["agy", "portable"]);
-export const RUNTIME_TARGETS = new Set([...INSTALL_TARGETS]);
-export const KNOWN_TARGETS = new Set([...INSTALL_TARGETS, ...EXPORT_TARGETS]);
+export const RUNTIME_TARGETS = new Set([...HELPER_INSTALL_TARGETS]);
+export const KNOWN_TARGETS = new Set([...HELPER_INSTALL_TARGETS, ...EXPORT_TARGETS]);
 export const CHANNELS = new Set(["stable", "beta"]);
 export const LANGUAGES = new Set(["vi", "en"]);
 export const KITS = new Set(["engineer", "marketing"]);
@@ -21,6 +27,22 @@ export function targetSpecIsSupported(value, supportedTargets) {
   return targets.length > 0 && targets.every((target) => supportedTargets.has(target));
 }
 
+export function specHasProfileTarget(value) {
+  return splitTargetSpec(value).some((target) => PROFILE_TARGETS.has(target));
+}
+
+export function helperRuntimeTargets({ command, global = false } = {}) {
+  const base = command === "update" ? UPDATE_TARGETS : INSTALL_TARGETS;
+  return global ? new Set([...base, ...PROFILE_TARGETS]) : new Set(base);
+}
+
+export function assertProfileTargetsAreGlobal(options) {
+  const selectedTarget = options.target || options.runtime;
+  if (specHasProfileTarget(selectedTarget) && options.project) {
+    throw new Error("pi-ak and pi-omp are global profile targets; use --global");
+  }
+}
+
 export function validateForCommand(options) {
   const selectedTarget = options.target || options.runtime;
   const hasDiscoveryOptions = options.deepScanRoots.length > 0 ||
@@ -36,18 +58,20 @@ export function validateForCommand(options) {
     return;
   }
   if (options.command === "install") {
-    if (selectedTarget && !targetSpecIsSupported(selectedTarget, INSTALL_TARGETS)) {
+    if (selectedTarget && !targetSpecIsSupported(selectedTarget, HELPER_INSTALL_TARGETS)) {
       throw new Error(`target ${selectedTarget} is export-only; use the export command`);
     }
+    assertProfileTargetsAreGlobal(options);
     if (options.out) throw new Error("--out is valid only with export");
     if (options.allowDowngrade) throw new Error("--allow-downgrade is valid only with self-update or update --binary-only");
     if (hasDiscoveryOptions) throw new Error("deep scan options are valid only with update-all");
     return;
   }
   if (options.command === "update") {
-    if (selectedTarget && !targetSpecIsSupported(selectedTarget, UPDATE_TARGETS)) {
+    if (selectedTarget && !targetSpecIsSupported(selectedTarget, HELPER_UPDATE_TARGETS)) {
       throw new Error(`target ${selectedTarget} is not supported by ak update`);
     }
+    assertProfileTargetsAreGlobal(options);
     if (options.out) throw new Error("--out is valid only with export");
     if (options.allowDowngrade && !options.binaryOnly) {
       throw new Error("--allow-downgrade requires update --binary-only");

package/lib/commands.mjs

@@ -51,6 +51,42 @@ export function updateApplyArgs(selection) {
   return [...updateBase(selection), "--yes", "--verbose"];
 }
 
+export function usesKitRefresh(runtime) {
+  return runtime === "dsh";
+}
+
+export function kitRefreshArgs({
+  global, kit = "engineer", channel, target = "dsh",
+}) {
+  return [
+    "kit",
+    "refresh",
+    kit,
+    "--target",
+    target,
+    ...(global ? ["--global"] : []),
+    "--channel",
+    channel,
+    "--yes",
+    "--verbose",
+  ];
+}
+
+export function updatePreviewArgsForRuntime(selection) {
+  return usesKitRefresh(selection.target) ? null : updatePreviewArgs(selection);
+}
+
+export function updateApplyArgsForRuntime(selection) {
+  return usesKitRefresh(selection.target) ? kitRefreshArgs(selection) : updateApplyArgs(selection);
+}
+
+export function splitRuntimesForUpdate(runtimes) {
+  return {
+    update: runtimes.filter((runtime) => !usesKitRefresh(runtime)),
+    refresh: runtimes.filter((runtime) => usesKitRefresh(runtime)),
+  };
+}
+
 export function selfUpdateCheckArgs(channel) {
   return ["self-update", "--check", "--channel", channel];
 }

package/lib/i18n.mjs

@@ -32,7 +32,9 @@ const messages = {
     targetPrompt: "Which coding runtimes should receive {kit}?",
     updateTargetPrompt: "Which installed runtimes should update {kit}?",
     allRuntimes: "All supported runtimes",
-    dshUpdateUnsupported: "dsh — not supported by ak update",
+    piAkProfile: "pi-ak (Pi profile)",
+    piOmpProfile: "pi-omp (OMP profile)",
+    profileTargetsNeedGlobal: "pi-ak and pi-omp are global profile targets; use --global",
     exportTargetPrompt: "Export creates a copy; it does not install a runtime. Choose a format:",
     savedTargetNeedsUpdateRuntime: "Saved project target {target} is install-only. Update supports {supported}. Re-run with --runtime <target> or choose interactively.",
     agyExport: "agy (global-only export)",
@@ -167,7 +169,9 @@ const messages = {
     targetPrompt: "Các runtime nào sẽ nhận {kit}?",
     updateTargetPrompt: "Các runtime nào sẽ cập nhật {kit}?",
     allRuntimes: "Tất cả runtime được hỗ trợ",
-    dshUpdateUnsupported: "dsh — ak update chưa hỗ trợ",
+    piAkProfile: "pi-ak (profile Pi)",
+    piOmpProfile: "pi-omp (profile OMP)",
+    profileTargetsNeedGlobal: "pi-ak và pi-omp là profile global; dùng --global",
     exportTargetPrompt: "Export tạo một bản sao, không cài vào runtime. Chọn dạng export:",
     savedTargetNeedsUpdateRuntime: "Target đã lưu của project là {target} và chỉ dùng cho install. Update chỉ hỗ trợ {supported}. Hãy chạy lại với --runtime <target> hoặc chọn lại trong chế độ interactive.",
     agyExport: "agy (chỉ export global)",

package/lib/pi-profiles.mjs

@@ -1,6 +1,7 @@
 import { existsSync } from "node:fs";
 import { homedir } from "node:os";
-import { extname, isAbsolute, resolve, win32 } from "node:path";
+import { extname, isAbsolute, join, resolve, win32 } from "node:path";
+import { PROFILE_RUNTIME } from "./args.mjs";
 
 function validPath(value) {
   return typeof value === "string" && (isAbsolute(value) || win32.isAbsolute(value));
@@ -100,3 +101,46 @@ export function classifyPiProfiles(profiles) {
     )),
   };
 }
+
+export function isProfileTarget(target) {
+  return Object.hasOwn(PROFILE_RUNTIME, target);
+}
+
+export function akRuntimeForHelperTarget(target) {
+  return PROFILE_RUNTIME[target] || target;
+}
+
+export function defaultProfileProcessOptions(id, { home = homedir() } = {}) {
+  if (id === "pi-ak") {
+    const agentDir = join(home, ".pi", "profiles", "pi-ak");
+    return piProfileProcessOptions({
+      runtime: "pi", agentDir, sessionDir: join(agentDir, "sessions"),
+    });
+  }
+  if (id === "pi-omp") {
+    return piProfileProcessOptions({
+      runtime: "omp",
+      agentDir: join(home, ".omp", "profiles", "pi-omp", "agent"),
+      sessionDir: null,
+    });
+  }
+  return { envOverrides: {}, envUnset: [] };
+}
+
+export function resolveProfileProcessOptions(id, profiles = [], { home = homedir() } = {}) {
+  const found = profiles.find((profile) => profile.id === id);
+  return found ? piProfileProcessOptions(found) : defaultProfileProcessOptions(id, { home });
+}
+
+export function materializeHelperTarget(selection, profiles = [], { home = homedir() } = {}) {
+  const helperTarget = selection.target;
+  const env = isProfileTarget(helperTarget)
+    ? resolveProfileProcessOptions(helperTarget, profiles, { home })
+    : { envOverrides: {}, envUnset: [] };
+  return {
+    ...selection,
+    helperTarget,
+    target: akRuntimeForHelperTarget(helperTarget),
+    ...env,
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thieung/agentkit-helper",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Community helper for installing and updating AgentKit kits by runtime and channel",
   "type": "module",
   "bin": {