nolo-cli 0.1.17 → 0.1.18

package/agentAliases.ts

@@ -0,0 +1,26 @@
+export const PLATFORM_DEMO_USER_ID = "b2e06f801f";
+export const FRONTEND_IMPLEMENTER_AGENT_ID = "01FRONTENDAG0000000115N4E1";
+export const FRONTEND_IMPLEMENTER_AGENT_KEY =
+  `agent-${PLATFORM_DEMO_USER_ID}-${FRONTEND_IMPLEMENTER_AGENT_ID}`;
+
+const AGENT_ALIAS_TO_KEY: Record<string, string> = {
+  "frontend-implementer": FRONTEND_IMPLEMENTER_AGENT_KEY,
+  "frontend-agent": FRONTEND_IMPLEMENTER_AGENT_KEY,
+  frontend: FRONTEND_IMPLEMENTER_AGENT_KEY,
+  "front-end": FRONTEND_IMPLEMENTER_AGENT_KEY,
+  "前端": FRONTEND_IMPLEMENTER_AGENT_KEY,
+  "前端实现员": FRONTEND_IMPLEMENTER_AGENT_KEY,
+};
+
+function parseAgentKeyFromInput(raw: string): string {
+  const trimmed = raw.trim();
+  if (trimmed.startsWith("http://") || trimmed.startsWith("https://")) {
+    const url = new URL(trimmed);
+    return url.pathname.replace(/^\/+/, "");
+  }
+  return trimmed;
+}
+
+export function resolveCliAgentKeyInput(raw: string): string {
+  return AGENT_ALIAS_TO_KEY[raw.trim().toLowerCase()] ?? parseAgentKeyFromInput(raw);
+}

package/agentPullCommand.ts

@@ -1,6 +1,7 @@
 import { DEFAULT_NOLO_SERVER_URL } from "./defaultServer";
 import { getDefaultCliLocalRuntimeDb } from "./localRuntimeDb";
 import type { CliLocalRuntimeDb } from "./client/localRuntimeAdapter";
+import { resolveCliAgentKeyInput } from "./agentAliases";
 
 type EnvLike = Record<string, string | undefined>;
 
@@ -40,7 +41,7 @@ function positionalArgs(args: string[]) {
 export function parseAgentPullArgs(args: string[]): ParsedAgentPullArgs | null {
   const agentKey = readFlagValue(args, "--agent") ?? positionalArgs(args)[0];
   if (!agentKey?.trim()) return null;
-  return { agentKey: agentKey.trim() };
+  return { agentKey: resolveCliAgentKeyInput(agentKey) };
 }
 
 function resolveServerUrl(env: EnvLike) {

package/agentRunCommand.ts

@@ -2,7 +2,8 @@ import { DEFAULT_NOLO_SERVER_URL } from "./defaultServer";
 import { runAgentTurn, type RunAgentTurnResult } from "./client/agentRun";
 import type { AgentRuntimeRequestedMode } from "./agentRuntimeLocal";
 import { existsSync, readFileSync } from "node:fs";
-import { extname, resolve } from "node:path";
+import { extname, join, resolve } from "node:path";
+import { resolveCliAgentKeyInput } from "./agentAliases";
 
 type EnvLike = Record<string, string | undefined>;
 
@@ -15,6 +16,7 @@ type AgentRunCommandDeps = {
   scriptDir: string;
   output?: OutputLike;
   runner?: typeof runAgentTurn;
+  prepareShellWorktree?: typeof prepareShellWorktree;
 };
 
 type ParsedAgentRunArgs = {
@@ -82,7 +84,7 @@ export function parseAgentRunArgs(args: string[]): ParsedAgentRunArgs | null {
     ...readRepeatedFlagValues(args, "--image-url"),
   ];
   return {
-    agentKey,
+    agentKey: resolveCliAgentKeyInput(agentKey),
     message: message.trim(),
     imageUrls,
     allowShell: args.includes("--dangerously-allow-shell"),
@@ -117,6 +119,49 @@ function resolveServerUrl(env: EnvLike) {
   return (env.NOLO_SERVER || env.BASE_URL || DEFAULT_NOLO_SERVER_URL).replace(/\/+$/, "");
 }
 
+function safePathSegment(input: string) {
+  return input.replace(/[^a-zA-Z0-9._-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 80) || "agent";
+}
+
+function createTaskId() {
+  return Date.now().toString(36).toUpperCase();
+}
+
+async function runGit(args: string[], cwd: string) {
+  const proc = Bun.spawn(["git", ...args], {
+    cwd,
+    stdout: "pipe",
+    stderr: "pipe",
+    stdin: "ignore",
+  });
+  const [stdout, stderr, exitCode] = await Promise.all([
+    new Response(proc.stdout).text(),
+    new Response(proc.stderr).text(),
+    proc.exited,
+  ]);
+  if (exitCode !== 0) {
+    throw new Error(stderr.trim() || stdout.trim() || `git ${args.join(" ")} failed`);
+  }
+  return stdout.trim();
+}
+
+export async function prepareShellWorktree(args: {
+  agentKey: string;
+  cwd?: string;
+  env?: EnvLike;
+}) {
+  if (args.env?.NOLO_LOCAL_WORKTREE) return args.env.NOLO_LOCAL_WORKTREE;
+  const cwd = args.cwd ?? process.cwd();
+  const root = await runGit(["rev-parse", "--show-toplevel"], cwd);
+  const parent = join(root, ".worktrees");
+  const safeAgent = safePathSegment(args.agentKey);
+  const taskId = createTaskId();
+  const worktreePath = join(parent, `nolo-agent-${safeAgent}-${taskId}`);
+  const branchName = `nolo-agent-${safeAgent}-${taskId}`;
+  await runGit(["worktree", "add", worktreePath, "-b", branchName, "HEAD"], root);
+  return worktreePath;
+}
+
 function writeUsage(output: OutputLike) {
   output.write(
     "Usage: nolo agent run <agent> <message> [--local|--server|--auto] [--continue <dialogId>]\n" +
@@ -134,8 +179,19 @@ export async function runAgentRunCommand(args: string[], deps: AgentRunCommandDe
   }
 
   const runner = deps.runner ?? runAgentTurn;
+  let localRuntimeCwd: string | undefined;
+  if (parsed.allowShell) {
+    localRuntimeCwd = await (deps.prepareShellWorktree ?? prepareShellWorktree)({
+      agentKey: parsed.agentKey,
+      env,
+    });
+  }
   const runEnv = parsed.allowShell
-    ? { ...env, NOLO_LOCAL_SHELL_MODE: "worktree" }
+    ? {
+        ...env,
+        NOLO_LOCAL_SHELL_MODE: "worktree",
+        ...(localRuntimeCwd ? { NOLO_LOCAL_WORKTREE: localRuntimeCwd } : {}),
+      }
     : env;
   const result: RunAgentTurnResult = await runner({
     agentName: parsed.agentKey,
@@ -146,6 +202,7 @@ export async function runAgentRunCommand(args: string[], deps: AgentRunCommandDe
     scriptDir: deps.scriptDir,
     env: runEnv,
     output,
+    ...(localRuntimeCwd ? { localRuntimeCwd } : {}),
     ...(parsed.runtimeMode ? { runtimeMode: parsed.runtimeMode } : {}),
     ...(parsed.continueDialogId ? { continueDialogId: parsed.continueDialogId } : {}),
   });

package/client/agentRun.ts

@@ -24,6 +24,7 @@ type RunAgentTurnOptions = {
   runtimeMode?: AgentRuntimeRequestedMode;
   localRuntimeAdapter?: AgentRuntimeHostAdapter;
   localRuntimeAdapterFactory?: (env: EnvLike) => AgentRuntimeHostAdapter;
+  localRuntimeCwd?: string;
   scriptPathExists?: (path: string) => boolean;
   fetchImpl?: typeof fetch;
 };
@@ -61,6 +62,7 @@ function buildDefaultLocalRuntimeAdapter(options: RunAgentTurnOptions) {
   return createCliLocalRuntimeAdapter({
     env: options.env,
     fetchImpl: options.fetchImpl,
+    cwd: options.localRuntimeCwd,
   });
 }
 

package/client/localRuntimeAdapter.test.ts

@@ -215,7 +215,7 @@ describe("CLI local runtime adapter", () => {
     expect(result.content).toContain("README.md");
   });
 
-  test("advertises execShell to OpenAI-compatible providers when the agent declares it", async () => {
+  test("advertises execShell to OpenAI-compatible providers when shell mode is enabled", async () => {
     const requests: Array<{ body: any }> = [];
     const adapter = createCliLocalRuntimeAdapter({
       env: {
@@ -228,7 +228,6 @@ describe("CLI local runtime adapter", () => {
           dbKey: "agent-local-shell",
           prompt: "Use shell.",
           model: "gpt-4.1-mini",
-          toolNames: ["execShell"],
         }),
         put: async () => {},
         batch: async () => {},

package/client/localRuntimeAdapter.ts

@@ -67,8 +67,14 @@ function buildExecShellTool() {
   };
 }
 
-function buildOpenAiTools(toolNames: string[] = []) {
-  return toolNames.includes("execShell") ? [buildExecShellTool()] : [];
+function shellModeEnabled(env: EnvLike) {
+  return ["worktree", "dangerous", "1", "true"].includes(env.NOLO_LOCAL_SHELL_MODE || "");
+}
+
+function buildOpenAiTools(args: { toolNames?: string[]; env: EnvLike }) {
+  return args.toolNames?.includes("execShell") || shellModeEnabled(args.env)
+    ? [buildExecShellTool()]
+    : [];
 }
 
 function parseToolArguments(raw: string) {
@@ -291,7 +297,10 @@ export function createCliLocalRuntimeAdapter(
     resolveProvider: async (agentConfig) => ({
       model: agentConfig.model || "gpt-4.1-mini",
       complete: async (messages) => {
-        const tools = buildOpenAiTools(agentConfig.toolNames ?? []);
+        const tools = buildOpenAiTools({
+          toolNames: agentConfig.toolNames,
+          env: deps.env,
+        });
         const res = await fetchImpl(`${resolveOpenAiCompatibleBaseUrl(deps.env)}/chat/completions`, {
           method: "POST",
           headers: {

package/client/localToolPolicy.test.ts

@@ -6,7 +6,7 @@ describe("CLI local tool policy", () => {
   test("allows execShell in explicit worktree shell mode", () => {
     expect(resolveLocalToolPolicy({
       env: { NOLO_LOCAL_SHELL_MODE: "worktree" },
-      agentToolNames: ["execShell"],
+      agentToolNames: [],
       toolName: "execShell",
     })).toEqual({ allowed: true, toolName: "execShell" });
   });

package/client/localToolPolicy.ts

@@ -27,17 +27,13 @@ export function resolveLocalToolPolicy(args: {
 }): LocalToolPolicyDecision {
   if (args.toolName === "execShell") {
     const shellMode = args.env.NOLO_LOCAL_SHELL_MODE || "";
-    const agentTools = new Set(args.agentToolNames ?? []);
-    if (
-      agentTools.has("execShell") &&
-      ["worktree", "dangerous", "1", "true"].includes(shellMode)
-    ) {
+    if (["worktree", "dangerous", "1", "true"].includes(shellMode)) {
       return { allowed: true, toolName: args.toolName };
     }
     return {
       allowed: false,
       toolName: args.toolName,
-      reason: "execShell requires NOLO_LOCAL_SHELL_MODE=worktree and an agent that declares execShell.",
+      reason: "execShell requires NOLO_LOCAL_SHELL_MODE=worktree.",
     };
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nolo-cli",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "type": "module",
   "description": "Agent-first terminal workspace for Nolo",
   "bin": {
@@ -10,6 +10,7 @@
   "files": [
     "index.ts",
     "agentRuntimeLocal.ts",
+    "agentAliases.ts",
     "localRuntimeDb.ts",
     "agentRuntimeCommands.ts",
     "agentPullCommand.ts",