cowork-cli 0.2.8 → 1.1.0

package/README.md

@@ -54,7 +54,7 @@ cwk "Explain the data flow in the engine/ models"
 ## ✨ Features that Matter
 
 - **Zero-Whitespace UI**: High-density terminal output designed for professionals. No fluff, no headers, just data.
-- **Interactive Feedback**: The AI can now ask you clarifying questions via the `askUser` tool when it needs more context.
+- **Interactive Feedback**: The AI can request clarifications via the `askUser` tool or trigger an interactive `[ Yes ]  No` toggle using `askConfirm`.
 - **Smart Discovery**: Built-in `searchText`, `findFile`, and `projectTree` tools that respect your `.gitignore`.
 - **Surgical I/O**: Read entire files or specific line ranges (`readFileChunk`) with automatic binary detection.
 - **Piping Support**: Pipe logs or diffs directly into `cwk` for instant analysis.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cowork-cli",
-  "version": "0.2.8",
+  "version": "1.1.0",
   "description": "work with cowork",
   "bin": {
     "cwk": "bin/cli.js"
@@ -35,4 +35,4 @@
     "ipaddr.js": "^2.4.0",
     "openai": "^6.38.0"
   }
-}
+}

package/src/configs/config.json

@@ -1,8 +1,11 @@
 {
   "accents": {
-    "orangex": "#D97757",
-    "greyx": "#808080",
-    "resetx": "#FFFFFF"
-  },
-  "systemPrompt": "You are a concise Developer Analyst. Use available tools proactively to investigate and process the user query. Provide a direct answer based on your findings. ENVIRONMENT: Terminal. STRICT RULES: 1. NO conversational filler or pleasantries. 2. NO Markdown formatting (do not use asterisks, backticks, or hashes). 3. NO XML or HTML tags. 4. Output ONLY structured, concise plain text. 5. Use simple spacing and indentation for structure. CWD: ${folder}. Year: ${year}."
+    "main":    "#7BA5DA",
+    "tool":    "#F2CF6E",
+    "data":    "#C2C6C5",
+    "success": "#7AC391",
+    "error":   "#E07070",
+    "dim":     "#606060",
+    "header":  "#A37ACC"
+  }
 }

package/src/configs/sys.txt

@@ -0,0 +1,33 @@
+# IDENTITY
+You are Cowork (cwk), an interactive CLI tool acting as a Full Engineering Read-Only Analyst.
+
+# CORE MANDATES
+- ONLY perform exactly what the user explicitly says.
+- NO unsolicited investigations, side tasks, or extra work of any kind.
+- Provide accurate data with absolute minimum token usage unless "deep work" is requested.
+
+# CONSTRAINTS (Terminal Environment)
+- NO conversational filler, pleasantries, preambles, or postambles.
+- NO Markdown (no *, `, #, or code blocks). NO XML/HTML tags.
+- Output ONLY structured, concise plain text with simple spacing/indentation.
+- Cite code locations using: file_path:line_number.
+
+# EXECUTION & STYLE
+- Answer directly without elaboration or explanation.
+- Use fewer than 4 lines (excluding tool use). One-word answers are preferred.
+- Use all tools efficiently (parallel/sequential) to minimize context usage.
+- Verify dependencies and mimic local code style; never assume availability.
+
+# EXAMPLES
+user: files in src/?
+assistant:
+src/foo.js
+src/bar.js
+
+user: where is foo?
+assistant:
+src/foo.js:12
+
+# CONTEXT
+Working directory: ${folder}
+Year: ${year}

package/src/engine/client.js

@@ -10,7 +10,7 @@ function clientLoader() {
   const config = loadConfig();
   
   if (!validateConfig(config)) {
-    throw new Error("Configuration missing or invalid. Please configure your ~/.env file (run 'btw --help' for details).");
+    throw new Error("Configuration missing or invalid. Please configure your ~/.env file (run 'cwk --help' for details).");
   }
 
   // Normalize baseURL: remove trailing slashes as the SDK appends paths starting with /

package/src/engine/models/BaseModel.js

@@ -1,6 +1,6 @@
 import { toolDefinitions, dispatchTool } from '../tools/index.js';
 import { logger } from '../../utils/logger.js';
-import { spinner } from '../../utils/ui.js';
+import { ui } from '../../utils/ui.js';
 import { outputFormatted } from '../../utils/outputFormatter.js';
 
 /**
@@ -46,9 +46,9 @@ export default class BaseModel {
       turn++;
       
       try {
-        spinner.start("Thinking");
+        ui.think();
         const response = await this._getCompletion();
-        spinner.stop();
+        ui.stop();
 
         const message = response.choices[0].message;
 
@@ -71,7 +71,7 @@ export default class BaseModel {
         await this._processToolCalls(message.tool_calls);
 
       } catch (err) {
-        spinner.stop();
+        ui.stop();
         // Deep error logging for API failures
         if (err.status) {
           logger.error(`[API Error] Status: ${err.status}`);
@@ -146,9 +146,9 @@ export default class BaseModel {
           const jitter = Math.random() * 500;
           const finalDelay = delay + jitter;
 
-          spinner.update(`Error ${err.status}. Retrying in ${(finalDelay/1000).toFixed(1)}s`);
+          ui.update(`Error ${err.status}. Retrying in ${(finalDelay/1000).toFixed(1)}s`);
           await new Promise(resolve => setTimeout(resolve, finalDelay));
-          spinner.update("Thinking");
+          ui.update('Thinking');
           continue;
         }
         throw err;
@@ -194,25 +194,21 @@ export default class BaseModel {
         else if (name === 'readFileChunk') displayArg = `${args.filePath} [L${args.startLine}-${args.endLine}]`;
         else displayArg = args.url || args.filePath || args.dirPath || args.path || args.pattern || JSON.stringify(args);
 
-        const displayStr = displayArg.length > 60 ? displayArg.slice(0, 57) + "..." : displayArg;
-
-        // NOTE: 'askUser' is interactive and handles its own semantic logging ([asking]) 
-        // to maintain terminal focus and avoid conflicts with the global spinner.
-        if (name !== 'askUser') {
-          logger.secondary(`[${label}] ${displayStr}`);
-          spinner.start(`[${label}] working`);
+        // ui.start() handles terminal-aware truncation internally.
+        if (name !== 'askUser' && name !== 'askConfirm') {
+          ui.start(label, displayArg);
         }
         
         const result = await dispatchTool(name, args);
         
-        if (name !== 'askUser') {
-          spinner.stop();
+        if (name !== 'askUser' && name !== 'askConfirm') {
+          ui.stop();
         }
 
         this.addMessage('tool', result, { tool_call_id: toolCall.id });
 
       } catch (err) {
-        spinner.stop();
+        ui.stop();
         const errorMsg = err.message;
         logger.error(`[FAILED] ${name}: ${errorMsg}`);
         

package/src/engine/run.js

@@ -6,7 +6,6 @@ import DefaultModel from './models/default.js';
 import GeminiModel from './models/gemini.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const CONFIG_PATH = path.join(__dirname, '../configs/config.json');
 
 /**
  * Executes a chat completion query using the appropriate model handler.
@@ -21,17 +20,17 @@ export default async function runQuery(client, config, query) {
   }
 
   try {
-    // 1. Load and format system prompt from internal config
+    // 1. Load and format system prompt from internal sys.txt
     let systemPrompt = null;
     try {
-      const internalConfig = JSON.parse(fs.readFileSync(CONFIG_PATH, 'utf8'));
-      if (internalConfig.systemPrompt) {
-        systemPrompt = internalConfig.systemPrompt
+      const promptPath = path.join(__dirname, '../configs/sys.txt');
+      if (fs.existsSync(promptPath)) {
+        systemPrompt = fs.readFileSync(promptPath, 'utf8')
           .replace('${folder}', process.cwd())
-          .replace('${year}', new Date().getFullYear());
+          .replace(/\${year}/g, new Date().getFullYear());
       }
     } catch (e) {
-      // Fallback if config is missing - proceed without system prompt
+      // Fallback if prompt is missing - proceed without system prompt
     }
 
     const isGemini = config.model_type.toLowerCase() === 'gemini';

package/src/engine/tools/askConfirm.js

@@ -0,0 +1,34 @@
+import { ui } from '../../utils/ui.js';
+
+/**
+ * askConfirm tool — asks the user a yes/no question via the terminal.
+ *
+ * Accepted inputs (case-insensitive):
+ *   yes → y, yes
+ *   no  → n, no
+ *   cancel → Ctrl+C (treated as no, with dismissed flag)
+ *
+ * Any other input is silently erased and the prompt re-appears.
+ *
+ * @param {Object} args
+ * @param {string} args.question  The yes/no question to ask.
+ * @returns {Promise<string>}     JSON: { confirmed } or { confirmed, dismissed }
+ */
+export default async function askConfirm({ question }) {
+  // 1. Input validation
+  if (!question || typeof question !== 'string' || question.trim().length === 0) {
+    return JSON.stringify({ error: "'question' must be a non-empty string.", dismissed: true });
+  }
+
+  // 2. TTY guard — cannot prompt in pipes or CI environments
+  if (!process.stdin.isTTY) {
+    return JSON.stringify({
+      error: 'stdin is not a TTY. Cannot prompt in non-interactive environments.',
+      dismissed: true,
+    });
+  }
+
+  // 3. Delegate entirely to UIEngine — it owns all terminal state
+  const result = await ui.confirm(question);
+  return JSON.stringify(result);
+}

package/src/engine/tools/askUser.js

@@ -1,62 +1,32 @@
-import readlinePromises from 'readline/promises';
-import readline from 'readline';
-import { stdin as input, stdout as output } from 'process';
-import { formatSecondary } from '../../utils/logger.js';
+import { ui } from '../../utils/ui.js';
 
 /**
  * Implementation of the askUser tool.
- * Asks the user a single question via the terminal.
- * 
+ * Delegates rendering and input handling to the UIEngine singleton.
+ *
  * @param {Object} args
- * @param {string} args.question The question to ask the user.
- * @returns {Promise<string>} JSON string with answer or error.
+ * @param {string} args.question  The question to ask the user.
+ * @returns {Promise<string>}     JSON string: { answer } or { error, dismissed }.
  */
 export default async function askUser({ question }) {
-  // 1. Input Validation
-  if (!question) {
-    return "Error: 'question' parameter is required.";
-  }
-  
-  if (typeof question !== 'string' || question.trim().length === 0) {
-    return "Error: 'question' must be a non-empty string.";
+  // 1. Input validation
+  if (!question || typeof question !== 'string' || question.trim().length === 0) {
+    return JSON.stringify({ error: "'question' must be a non-empty string.", dismissed: true });
   }
 
-  // 2. TTY Check: Ensure we have a terminal to interact with
-  if (!input.isTTY) {
-    return "Error: stdin is not a TTY. Cannot prompt user in non-interactive environments.";
+  // 2. TTY check
+  if (!process.stdin.isTTY) {
+    return JSON.stringify({ error: 'stdin is not a TTY. Cannot prompt in non-interactive environments.', dismissed: true });
   }
 
-  const rl = readlinePromises.createInterface({ input, output });
-
-  return new Promise((resolve) => {
-    // 3. Graceful Signal Handling
-    rl.on('SIGINT', () => {
-      rl.close();
-      process.stdout.write(formatSecondary(` cancelled\n`));
-      resolve(JSON.stringify({ error: "user cancelled the request", dismissed: true }));
-    });
-
-    const doAsk = async () => {
-      try {
-        const answer = await rl.question(formatSecondary(`[asking] ${question} -> `));
-        const trimmed = answer.trim();
-
-        if (trimmed.length === 0) {
-          // Move cursor up and clear line reliably using Node's readline methods
-          readline.moveCursor(process.stdout, 0, -1);
-          readline.clearLine(process.stdout, 0);
-          readline.cursorTo(process.stdout, 0);
-          doAsk();
-        } else {
-          rl.close();
-          resolve(JSON.stringify({ answer: trimmed }));
-        }
-      } catch (err) {
-        rl.close();
-        resolve(JSON.stringify({ error: `System Error: ${err.message}`, dismissed: true }));
-      }
-    };
-
-    doAsk();
-  });
+  try {
+    const answer = await ui.ask(question);
+    return JSON.stringify({ answer });
+  } catch (err) {
+    // ui.ask() rejects with { cancelled: true } on SIGINT, or an Error otherwise.
+    if (err && err.cancelled) {
+      return JSON.stringify({ error: 'User cancelled the request.', dismissed: true });
+    }
+    return JSON.stringify({ error: `System Error: ${err.message}`, dismissed: true });
+  }
 }

package/src/engine/tools/index.js

@@ -8,6 +8,7 @@ import listTools from './listTools.js';
 import findFile from './findFile.js';
 import findDir from './findDir.js';
 import askUser from './askUser.js';
+import askConfirm from './askConfirm.js';
 
 export const toolDefinitions = [
   {
@@ -148,7 +149,7 @@ export const toolDefinitions = [
     type: "function",
     function: {
       name: "askUser",
-      description: "Ask the user a question via the terminal and get a text response.",
+      description: "Ask the user an open-ended question via the terminal and get a free-text response.",
       parameters: {
         type: "object",
         properties: {
@@ -157,6 +158,20 @@ export const toolDefinitions = [
         required: ["question"]
       }
     }
+  },
+  {
+    type: "function",
+    function: {
+      name: "askConfirm",
+      description: "Ask the user a yes/no confirmation question. Use this instead of askUser when only a boolean decision is needed. Returns { confirmed: true } for yes, { confirmed: false } for no, and { confirmed: false, dismissed: true } if the user cancels with Ctrl+C.",
+      parameters: {
+        type: "object",
+        properties: {
+          question: { type: "string", description: "The yes/no question to ask the user." }
+        },
+        required: ["question"]
+      }
+    }
   }
 ];
 
@@ -170,7 +185,8 @@ const toolImplementations = {
   listTools,
   findFile,
   findDir,
-  askUser
+  askUser,
+  askConfirm
 };
 
 /**

package/src/utils/configManager.js

@@ -17,10 +17,10 @@ export const loadConfig = () => {
       const envConfig = dotenv.parse(content);
       
       const config = {
-        model_name: envConfig.CWK_MODEL_NAME || envConfig.BTW_MODEL_NAME || envConfig.MODEL_NAME,
-        model_url: envConfig.CWK_MODEL_URL || envConfig.BTW_MODEL_URL || envConfig.MODEL_URL,
-        model_api_key: envConfig.CWK_MODEL_API_KEY || envConfig.BTW_MODEL_API_KEY || envConfig.MODEL_API_KEY,
-        model_type: envConfig.CWK_MODEL_TYPE || envConfig.BTW_MODEL_TYPE || envConfig.MODEL_TYPE
+        model_name: envConfig.CWK_MODEL_NAME || envConfig.MODEL_NAME,
+        model_url: envConfig.CWK_MODEL_URL || envConfig.MODEL_URL,
+        model_api_key: envConfig.CWK_MODEL_API_KEY || envConfig.MODEL_API_KEY,
+        model_type: envConfig.CWK_MODEL_TYPE || envConfig.MODEL_TYPE
       };
 
       // Remove undefined/empty values