nolo-cli 0.1.9 → 0.1.11

package/README.md

@@ -171,35 +171,3 @@ Future product-direction examples for the broader TUI command model:
 
 See [`docs/nolo-cli-tui.md`](../../docs/nolo-cli-tui.md) for the product and
 technical direction.
-
-## Building for Publish
-
-The CLI is developed in a monorepo with workspace dependencies (`ai` and
-`connector-experimental`). To generate a publish-safe package that can be
-installed via npm outside the monorepo:
-
-```bash
-bun run build:publish
-```
-
-This creates a `dist/` directory with:
-- All source files from the `files` array in package.json
-- Inlined workspace dependencies (copied as nested directories)
-- A modified package.json with workspace dependencies stripped
-
-The `dist/` directory can be published to npm:
-
-```bash
-cd dist
-npm publish
-```
-
-Key differences between repo-local and published versions:
-- **Repo-local**: Runs from source (`packages/cli/index.ts`) with workspace
-  dependencies resolved by the monorepo
-- **Published**: Runs from dist (`dist/index.ts`) with workspace dependencies
-  inlined as nested directories
-
-Both versions use the same Bun runtime and TypeScript source files. The build
-process does not transpile; it only restructures the package for standalone use.
-

package/agentRuntimeCommands.ts

@@ -1,10 +1,10 @@
-import type { MachineHeartbeat } from "./connector-experimental/protocol";
-import { detectMachineInfo } from "./connector-experimental/machineInfo";
+import type { MachineHeartbeat } from "connector-experimental/protocol";
+import { detectMachineInfo } from "connector-experimental/machineInfo";
 import {
   assertMachineRunAllowed,
   buildMachinePermissionPromptBlock,
   resolveMachineRunPermissionPolicy,
-} from "./ai/agent/machineRunPermissions";
+} from "../ai/agent/machineRunPermissions";
 import { resolveConnectorWebSocketTarget } from "./connectorWebSocketTarget";
 import { DEFAULT_NOLO_SERVER_URL } from "./defaultServer";
 

package/commandRegistry.ts

@@ -77,8 +77,8 @@ export function renderHelpText() {
     "  nolo connect",
     "  nolo connect --watch",
     "  nolo connect --ws",
-    "  nolo connect --daemon",
-    "  nolo daemon --server-url https://api.nolo.chat --api-key sk_machine_xxx",
+    "  nolo connect --ws --server-url https://api.nolo.chat --api-key sk_machine_xxx",
+    "  nolo connect --daemon --server-url https://api.nolo.chat --api-key sk_machine_xxx",
     "  nolo machine status",
     "  nolo doctor",
     "  nolo update",

package/machineCommands.ts

@@ -1,5 +1,5 @@
-import type { MachineHeartbeat } from "./connector-experimental/protocol";
-import { detectMachineInfo } from "./connector-experimental/machineInfo";
+import type { MachineHeartbeat } from "connector-experimental/protocol";
+import { detectMachineInfo } from "connector-experimental/machineInfo";
 import { mkdirSync, openSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
@@ -7,12 +7,12 @@ import { DEFAULT_NOLO_SERVER_URL } from "./defaultServer";
 import {
   type HeartbeatLoopOptions,
   runHeartbeatLoop as defaultRunHeartbeatLoop,
-} from "./connector-experimental/heartbeatLoop";
+} from "connector-experimental/heartbeatLoop";
 import {
   assertMachineRunAllowed,
   buildMachinePermissionPromptBlock,
   resolveMachineRunPermissionPolicy,
-} from "./ai/agent/machineRunPermissions";
+} from "../ai/agent/machineRunPermissions";
 import { resolveConnectorWebSocketTarget } from "./connectorWebSocketTarget";
 
 type EnvLike = Record<string, string | undefined>;
@@ -74,6 +74,31 @@ function hasFlag(args: string[], flag: string) {
   return args.includes(flag);
 }
 
+function readOption(args: string[], flag: string) {
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+    if (arg === flag) {
+      const next = args[i + 1];
+      if (typeof next === "string" && !next.startsWith("-")) return next;
+      return "";
+    }
+    if (arg.startsWith(flag + "=")) {
+      return arg.slice(flag.length + 1);
+    }
+  }
+  return "";
+}
+
+function resolveConnectServerUrl(args: string[], env: EnvLike) {
+  const fromFlag = readOption(args, "--server-url") || readOption(args, "--server");
+  const raw = fromFlag || env.NOLO_SERVER || env.BASE_URL || DEFAULT_NOLO_SERVER_URL;
+  return String(raw).replace(/\/+$|\s+$/g, "").replace(/\/+$/g, "").replace(/\s+$/g, "");
+}
+
+function resolveConnectAuthToken(args: string[], env: EnvLike) {
+  return readOption(args, "--api-key") || readOption(args, "--token") || resolveAuthToken(env);
+}
+
 function resolveDaemonLogPath(env: EnvLike) {
   return env.NOLO_CONNECT_LOG || join(homedir(), ".nolo", "logs", "connector.log");
 }
@@ -223,13 +248,13 @@ export async function runMachineConnectCommand(
 ) {
   const env = deps.env ?? process.env;
   const output = deps.output ?? process.stdout;
-  const authToken = resolveAuthToken(env);
+  const authToken = resolveConnectAuthToken(args, env);
   if (!authToken) {
     writeAuthMissing(output);
     return 1;
   }
 
-  const serverUrl = resolveServerUrl(env);
+  const serverUrl = resolveConnectServerUrl(args, env);
   const fetchImpl = deps.fetchImpl ?? fetch;
   const machine = (deps.machineInfo ?? detectLaunchableMachineInfo)();
   const sendHeartbeat = async () => {

package/package.json

@@ -1,15 +1,12 @@
 {
   "name": "nolo-cli",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "type": "module",
   "description": "Agent-first terminal workspace for Nolo",
   "bin": {
     "nolo": "index.ts"
   },
   "module": "index.ts",
-  "scripts": {
-    "build:publish": "bun build.ts"
-  },
   "files": [
     "index.ts",
     "agentRuntimeCommands.ts",
@@ -20,13 +17,10 @@
     "machineCommands.ts",
     "updateCommands.ts",
     "client/agentRun.ts",
-    "client/compactDialog.ts",
     "client/profileConfig.ts",
     "tui/readlineWorkspace.ts",
     "tui/session.ts",
-    "README.md",
-    "ai/**/*.ts",
-    "connector-experimental/**/*.ts"
+    "README.md"
   ],
   "publishConfig": {
     "access": "public"
@@ -34,6 +28,10 @@
   "devDependencies": {
     "bun-types": "latest"
   },
+  "dependencies": {
+    "ai": "workspace:*",
+    "connector-experimental": "workspace:*"
+  },
   "peerDependencies": {
     "typescript": "^5.0.0"
   }

package/ai/agent/_executeModel.ts

@@ -1,118 +0,0 @@
-import { RootState } from "app/store";
-import { Agent, Message } from "app/types";
-import { selectCurrentDialogConfig } from "chat/dialog/dialogSlice";
-import { read } from "database/dbSlice";
-import { fetchAgentContexts } from "ai/agent/fetchAgentContexts";
-import { filterAndCleanMessages } from "integrations/openai/filterAndCleanMessages";
-import { selectAllMsgs } from "chat/messages/messageSlice";
-import { generateRequestBody } from "ai/llm/generateRequestBody";
-import { getApiEndpoint } from "ai/llm/providers";
-import { selectCurrentServer } from "app/settings/settingSlice";
-import { selectCurrentToken } from "auth/authSlice";
-
-import { sendOpenAICompletionsRequest } from "../chat/sendOpenAICompletionsRequest";
-import { performFetchRequest } from "../chat/fetchUtils";
-import { updateTokensAction } from "chat/dialog/actions/updateTokensAction";
-import { extractCustomId } from "core/prefix";
-
-export const _executeModel = async (
-  options: {
-    isStreaming: boolean;
-    withAgentContext: boolean;
-    withChatHistory: boolean;
-    agentConfigOverrides?: Record<string, any>;
-  },
-  args: {
-    llmConfig?: Partial<Agent> & Pick<Agent, "provider" | "model">;
-    agentKey?: string;
-    agentConfig?: Partial<Agent> & Pick<Agent, "provider" | "model">;
-    content: any;
-    parentMessageId?: string;
-    billingDialogKey?: string;
-  },
-  thunkApi: any
-) => {
-  const { isStreaming, withAgentContext, withChatHistory, agentConfigOverrides } = options;
-  const { getState, dispatch, rejectWithValue } = thunkApi;
-  const { content } = args;
-  const state = getState() as RootState;
-
-  let agentConfig: Partial<Agent> & Pick<Agent, "provider" | "model">;
-  if (args.llmConfig) {
-    agentConfig = args.llmConfig;
-  } else if (args.agentConfig) {
-    agentConfig = args.agentConfig;
-  } else {
-    const agentKey = args.agentKey || selectCurrentDialogConfig(state)?.cybots?.[0];
-    if (!agentKey) {
-      const msg = "Model execution failed: No llmConfig, agentConfig, or agentKey provided.";
-      console.error(msg);
-      return rejectWithValue(msg);
-    }
-    try {
-      agentConfig = await dispatch(read({ dbKey: agentKey })).unwrap();
-    } catch (error: any) {
-      console.error(`_executeModel failed to load agent [${agentKey}]`, error);
-      return rejectWithValue(error.message);
-    }
-  }
-
-  try {
-    const resolvedConfig = agentConfigOverrides
-      ? { ...agentConfig, ...agentConfigOverrides }
-      : agentConfig;
-    const agentContexts = withAgentContext
-      ? await fetchAgentContexts(resolvedConfig.references, dispatch)
-      : {};
-
-    let messages: Message[];
-    if (withChatHistory) {
-      messages = filterAndCleanMessages(selectAllMsgs(state));
-      messages.push({ role: "user", content: args.content });
-    } else {
-      messages = [{ role: "user", content: args.content }];
-    }
-
-    const bodyData = generateRequestBody({
-      agentConfig: resolvedConfig,
-      messages,
-      userInput: content,
-      contexts: agentContexts,
-    });
-    bodyData.stream = isStreaming;
-
-    if (isStreaming) {
-      await sendOpenAICompletionsRequest({
-        bodyData,
-        agentConfig: resolvedConfig,
-        thunkApi,
-        dialogKey: selectCurrentDialogConfig(state)?.dbKey,
-        parentMessageId: args.parentMessageId,
-      });
-    } else {
-      const response = await performFetchRequest({
-        agentConfig: resolvedConfig,
-        api: getApiEndpoint(resolvedConfig),
-        bodyData,
-        currentServer: selectCurrentServer(state),
-        token: selectCurrentToken(state),
-      });
-      const result = await response.json();
-      if (args.billingDialogKey && result?.usage) {
-        await updateTokensAction(
-          {
-            dialogId: extractCustomId(args.billingDialogKey),
-            dialogKey: args.billingDialogKey,
-            usage: result.usage,
-            agentConfig: resolvedConfig,
-          },
-          thunkApi
-        );
-      }
-      return result.choices[0].message.content;
-    }
-  } catch (error: any) {
-    console.error(`_executeModel failed`, error);
-    return rejectWithValue(error.message);
-  }
-};