@openagents-org/agent-launcher 0.2.160 → 0.2.162

package/src/adapters/workspace-prompt.js

@@ -869,6 +869,26 @@ function buildOpenCodeSystemPrompt({ agentName, workspaceId, channelName, endpoi
   return identity + directive + '\n' + collab + '\n' + modePrompt + '\n' + api + '\n' + buildGuardrails();
 }
 
+/**
+ * Build the system prompt appended to Pi's own prompt (`--append-system-prompt`).
+ *
+ * Shape mirrors buildOpenCodeSystemPrompt: identity + browser directive +
+ * collaboration + mode + the REST "skills" block, because Pi is NOT wired to an
+ * MCP server (only the Claude adapter uses --mcp-config). Pi reaches workspace
+ * APIs through its built-in `bash` tool + curl, exactly like OpenCode/Amp.
+ *
+ * NOTE: this is APPENDED, never passed via `--system-prompt` — that flag would
+ * REPLACE Pi's own coding-assistant prompt and strip its tool instructions.
+ */
+function buildPiSystemPrompt({ agentName, workspaceId, channelName, endpoint, token, mode = 'execute', disabledModules, browserEnabled = false }) {
+  const identity = buildWorkspaceIdentity(agentName, workspaceId, channelName, mode, 'skills');
+  const directive = buildBrowserDirective(browserEnabled);
+  const collab = buildCollaborationPrompt('skills', workspaceSkillName(agentName));
+  const modePrompt = buildModePrompt(mode);
+  const api = buildApiSkillsPrompt({ endpoint, workspaceId, token, agentName, channelName, disabledModules, mode });
+  return identity + directive + '\n' + collab + '\n' + modePrompt + '\n' + api + '\n' + buildGuardrails();
+}
+
 /**
  * Build workspace skill markdown for OpenCode (written to .opencode/skills/).
  */
@@ -972,6 +992,7 @@ module.exports = {
   buildOpenclawSkillMd,
   buildOpenCodeSystemPrompt,
   buildOpenCodeSkillMd,
+  buildPiSystemPrompt,
   buildClaudeSkillMd,
   buildCursorSkillMd,
 };

package/src/daemon.js

@@ -51,7 +51,7 @@ class Daemon {
       if (!this._nodeClient) {
         this._nodeClient = new WorkspaceClient(n.endpoint);
       }
-      const info = { ...nodeCfg.gatherDeviceInfo(), agents: this._buildRoster(), runtimes: this._runtimes };
+      const info = { ...nodeCfg.gatherDeviceInfo(), agents: this._buildRoster(), runtimes: this._runtimes, fs: this._buildFs() };
       const resp = await this._nodeClient.nodeHeartbeat(n.node_id, n.token, info);
       // The heartbeat response is our push channel: run any queued remote
       // agent-management commands the workspace enqueued for this node. Fire
@@ -80,7 +80,19 @@ class Daemon {
     try {
       for (const a of this.config.getAgents()) {
         const proc = this._processes[a.name];
-        roster.push({ name: a.name, type: a.type || 'unknown', status: (proc && proc.state) || 'stopped' });
+        // Model: per-agent env override, else the type-level saved model. Working
+        // dir: the agent's configured path. Both power the workspace agent cards.
+        let model = (a.env && a.env.LLM_MODEL) || null;
+        if (!model) {
+          try { model = (this.envManager.load(a.type) || {}).LLM_MODEL || null; } catch { model = null; }
+        }
+        roster.push({
+          name: a.name,
+          type: a.type || 'unknown',
+          status: (proc && proc.state) || 'stopped',
+          model: model || null,
+          workingDir: a.path || null,
+        });
       }
     } catch {
       // best-effort
@@ -88,6 +100,36 @@ class Daemon {
     return roster;
   }
 
+  /**
+   * Filesystem hint for the working-directory picker: home + its immediate
+   * (non-hidden) subfolders, so the workspace can show real folders instantly.
+   */
+  _buildFs() {
+    try {
+      const home = os.homedir();
+      const dirs = fs.readdirSync(home, { withFileTypes: true })
+        .filter((d) => d.isDirectory() && !d.name.startsWith('.'))
+        .map((d) => d.name)
+        .sort((a, b) => a.localeCompare(b))
+        .slice(0, 100);
+      return { home, dirs };
+    } catch {
+      return {};
+    }
+  }
+
+  /** List the (non-hidden) subfolders of a directory, for on-demand browsing. */
+  _listDir(dir) {
+    const target = dir && String(dir).trim() ? String(dir) : os.homedir();
+    const dirs = fs.readdirSync(target, { withFileTypes: true })
+      .filter((d) => d.isDirectory() && !d.name.startsWith('.'))
+      .map((d) => d.name)
+      .sort((a, b) => a.localeCompare(b))
+      .slice(0, 500);
+    const parent = path.dirname(target);
+    return { path: target, parent: parent === target ? null : parent, dirs };
+  }
+
   /**
    * Detect, for every supported agent type, whether its runtime is installed and
    * logged-in/ready on this device. Runs `agn runtimes --json` in a CHILD process
@@ -117,6 +159,7 @@ class Daemon {
     const name = (args.name || '').trim();
     let ok = false;
     let message = '';
+    let data = null;
     try {
       if (action === 'create_agent') {
         const type = (args.type || '').trim();
@@ -150,6 +193,29 @@ class Daemon {
         const r = await this._runAgn(['remove', name]);
         ok = r.code === 0;
         message = ok ? `Agent '${name}' removed` : (r.stderr || r.stdout || 'remove failed');
+      } else if (action === 'configure_agent') {
+        // Reconfigure an existing agent: update model/key (type-level env), then
+        // restart it so the change takes effect. Working-dir changes require a
+        // recreate (agn has no in-place path change) at the new path.
+        const type = (args.type || '').trim();
+        if (args.apiKey) await this._runAgn(['env', type, '--set', `LLM_API_KEY=${args.apiKey}`]);
+        if (args.model !== undefined) {
+          await this._runAgn(['env', type, '--set', `LLM_MODEL=${String(args.model || '')}`]);
+        }
+        const newDir = (args.workingDir || '').trim();
+        if (newDir && newDir !== (args.currentWorkingDir || '')) {
+          try { fs.mkdirSync(newDir, { recursive: true }); } catch {}
+          await this._runAgn(['remove', name]);
+          const rc = await this._runAgn(['create', name, '--type', type, '--install', '--path', newDir]);
+          if (rc.code !== 0) throw new Error(rc.stderr || rc.stdout || 'recreate failed');
+          const rc2 = await this._runAgn(['connect', name, n.token, '--endpoint', n.endpoint]);
+          if (rc2.code !== 0) throw new Error(rc2.stderr || rc2.stdout || 'connect failed');
+        } else {
+          await this._runAgn(['stop', name]);
+          await this._runAgn(['start', name]);
+        }
+        ok = true;
+        message = `Agent '${name}' reconfigured`;
       } else if (action === 'detect_runtimes') {
         await this._refreshRuntimes();
         // Push the fresh detection right away rather than waiting for the next
@@ -157,6 +223,10 @@ class Daemon {
         this._nodeHeartbeat();
         ok = true;
         message = `Detected ${this._runtimes.length} runtime(s)`;
+      } else if (action === 'list_dir') {
+        data = this._listDir(args.path);
+        ok = true;
+        message = `Listed ${data.dirs.length} folder(s)`;
       } else {
         message = `Unknown action '${action}'`;
       }
@@ -165,7 +235,7 @@ class Daemon {
       message = e.message || String(e);
     }
     try {
-      await this._nodeClient.nodeCommandResult(cmd.commandId, n.token, { ok, message });
+      await this._nodeClient.nodeCommandResult(cmd.commandId, n.token, { ok, message, data });
     } catch {
       // best-effort; the command stays 'running' if we can't report back
     }

package/src/installer.js

@@ -665,7 +665,12 @@ class Installer {
     const directReady = directEnv || directSaved;
     const envAnyReady = this._hasAnyValue(process.env, checkReady.env_vars);
     const savedAnyReady = !!(checkReady.saved_env_key && savedEnv[checkReady.saved_env_key]);
-    const credsReady = this._checkCredsReady(checkReady);
+    // A registry entry may require a non-empty JSON object rather than mere
+    // parseability. In that mode the stricter _evaluateCredsFile path below is
+    // authoritative; the legacy parser treats an empty {} as ready.
+    const credsReady = checkReady.creds_json_has_entries
+      ? false
+      : this._checkCredsReady(checkReady);
     // Content-free credential probes (opt-in via check_ready). Detect agents
     // whose sign-in is a local OAuth/credential FILE (e.g. Gemini's
     // ~/.gemini/oauth_creds.json) or a service-account file path, WITHOUT
@@ -792,9 +797,12 @@ class Installer {
   }
 
   /**
-   * Existence/readability of a credential file WITHOUT reading its contents —
-   * never loads a token/key into memory. Returns 'present' | 'unreadable' |
-   * 'absent'. A non-empty readable file (or a non-empty directory) is 'present';
+   * Existence/readability of a credential file. Returns 'present' |
+   * 'unreadable' | 'absent'. A non-empty readable file (or a non-empty
+   * directory) is normally 'present'. Entries with creds_json_has_entries
+   * additionally require at least one top-level JSON entry, allowing an empty
+   * auto-created {} file to remain signed out. Credential values are never
+   * logged or returned.
    * a path that exists but cannot be statted/read is 'unreadable'. Resolves "~"
    * against the running user's home (the daemon/launcher user), not the
    * renderer/browser user.
@@ -809,6 +817,14 @@ class Installer {
       const st = fs.statSync(p);
       if (st.isDirectory()) return fs.readdirSync(p).length > 0 ? 'present' : 'absent';
       fs.accessSync(p, fs.constants.R_OK);
+      if (checkReady.creds_json_has_entries) {
+        const parsed = JSON.parse(fs.readFileSync(p, 'utf-8'));
+        if (Array.isArray(parsed)) return parsed.length > 0 ? 'present' : 'absent';
+        if (parsed && typeof parsed === 'object') {
+          return Object.keys(parsed).length > 0 ? 'present' : 'absent';
+        }
+        return 'absent';
+      }
       return st.size > 0 ? 'present' : 'absent';
     } catch {
       return 'unreadable';

package/src/workspace-client.js

@@ -143,13 +143,13 @@ class WorkspaceClient {
    * Report the outcome of a remote node command via
    * POST /v1/nodes/commands/{id}/result (authenticated by the workspace token).
    */
-  async nodeCommandResult(commandId, token, { ok, message } = {}) {
-    const data = await this._post(
+  async nodeCommandResult(commandId, token, { ok, message, data } = {}) {
+    const resp = await this._post(
       `/v1/nodes/commands/${commandId}/result`,
-      { ok: !!ok, message: message || null },
+      { ok: !!ok, message: message || null, data: data ?? null },
       this._wsHeaders(token),
     );
-    return data.data || data;
+    return resp.data || resp;
   }
 
   /**