prior-cli 1.2.8 → 1.3.0

package/bin/prior.js

@@ -606,8 +606,9 @@ async function startChat(opts = {}) {
 
   // Conversation history (for agent mode, keeps full multi-turn context)
   const chatHistory = [];
-  let currentModel = opts.model || null;
-  let uncensored   = opts.uncensored || false;
+  let currentModel          = opts.model || null;
+  let uncensored            = opts.uncensored || false;
+  let _currentAbortController = null;
 
   // ── Live slash-command suggestions ──────────────────────────
   let clearSuggestions = () => {};
@@ -657,6 +658,11 @@ async function startChat(opts = {}) {
 
       if (_suggTimer) { clearTimeout(_suggTimer); _suggTimer = null; }
 
+      if (key.name === 'escape' && _currentAbortController) {
+        _currentAbortController.abort();
+        return;
+      }
+
       if (key.name === 'return' || key.name === 'enter' || (key.ctrl && key.name === 'c')) {
         clearSuggestions();
         return;
@@ -989,6 +995,7 @@ Keep it under 350 words. Write prior.md now.`;
             return approved;
           };
 
+          _currentAbortController = new AbortController();
           await runAgent({
             messages:       [...chatHistory, { role: 'user', content: input }],
             model:          currentModel,
@@ -996,6 +1003,7 @@ Keep it under 350 words. Write prior.md now.`;
             cwd:            process.cwd(),
             projectContext,
             confirm,
+            signal:         _currentAbortController.signal,
             send: ev => {
               switch (ev.type) {
 
@@ -1003,6 +1011,12 @@ Keep it under 350 words. Write prior.md now.`;
                   spinStart('thinking…');
                   break;
 
+                case 'cancelled':
+                  spinStop();
+                  process.stdout.write('\n');
+                  console.log(c.muted('  ✗ Cancelled'));
+                  break;
+
                 case 'tool_start':
                   spinStop();
                   _progressStarted = false;
@@ -1065,7 +1079,11 @@ Keep it under 350 words. Write prior.md now.`;
           });
         } catch (err) {
           spinStop();
-          console.error(c.err(`  ✗ ${err.message}`));
+          if (err.name !== 'AbortError') {
+            console.error(c.err(`  ✗ ${err.message}`));
+          }
+        } finally {
+          _currentAbortController = null;
         }
 
         chatHistory.push({ role: 'user', content: input });

package/lib/agent.js

@@ -2,7 +2,6 @@
 
 const fetch = require('node-fetch');
 const { executeTool, TOOL_NAMES } = require('./tools');
-const { buildSystemPrompt } = require('./systemPrompt');
 const { getToken, getUsername } = require('./config');
 
 const CLI_BASE  = 'https://prior.ngrok.app/cli-backend';
@@ -11,12 +10,13 @@ const MAX_ITER   = 14;
 
 // ── Single inference call (server just runs Ollama + returns) ─
 
-async function infer(messages, model, token) {
+async function infer(messages, model, token, { cwd, uncensored, projectContext } = {}, signal) {
   const res = await fetch(`${CLI_BASE}/api/infer`, {
     method:  'POST',
     headers: { 'Content-Type': 'application/json' },
-    body:    JSON.stringify({ messages, model, token }),
+    body:    JSON.stringify({ messages, model, token, cwd, uncensored, projectContext }),
     timeout: 120000,
+    signal,
   });
   if (!res.ok) {
     const err = await res.json().catch(() => ({}));
@@ -151,28 +151,33 @@ function stripToolTags(text) {
 
 const CONFIRM_TOOLS = new Set(['run_command', 'file_delete', 'file_write']);
 
-async function runAgent({ messages, model, uncensored, cwd, projectContext, send, confirm }) {
-  const token    = getToken();
-  const username = getUsername() || 'user';
-  const sysPrompt = buildSystemPrompt(username, cwd, uncensored, projectContext);
-
-  const history = [
-    { role: 'system', content: sysPrompt },
-    ...messages,
-  ];
+async function runAgent({ messages, model, uncensored, cwd, projectContext, send, confirm, signal }) {
+  const token   = getToken();
+  const history = [...messages];
 
   let totalPromptTokens     = 0;
   let totalCompletionTokens = 0;
 
   for (let iter = 0; iter < MAX_ITER; iter++) {
 
+    if (signal?.aborted) {
+      send({ type: 'cancelled' });
+      send({ type: 'done' });
+      return;
+    }
+
     send({ type: 'thinking' });
 
     let result;
     try {
-      result = await infer(history, model || 'qwen3.5:4b', token);
+      result = await infer(history, model || 'qwen3.5:4b', token, { cwd, uncensored, projectContext }, signal);
     } catch (err) {
       await trackTokenUsage(token, totalPromptTokens, totalCompletionTokens);
+      if (err.name === 'AbortError' || signal?.aborted) {
+        send({ type: 'cancelled' });
+        send({ type: 'done' });
+        return;
+      }
       send({ type: 'error', message: err.message });
       send({ type: 'done' });
       return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prior-cli",
-  "version": "1.2.8",
+  "version": "1.3.0",
   "description": "Prior Network AI — command-line interface",
   "bin": {
     "prior": "bin/prior.js"

package/lib/systemPrompt.js

@@ -1,81 +0,0 @@
-'use strict';
-
-function buildSystemPrompt(username, cwd, uncensored, projectContext) {
-  const date = new Date().toLocaleDateString('en-US', { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' });
-
-  return `You are Prior, an AI assistant created by Niceguygamer (Euwin). Be direct, confident, and helpful. Never say "according to my database" or "based on my training data."
-
-IMPORTANT: Do NOT assume the person talking to you is Euwin. Euwin is the creator/developer — the user may be anyone.
-
-PERSONALITY: Dry wit, genuine character. One short off-script remark when it genuinely fits — don't force it.
-
-Origins: Started as a school bot for the BEN friend group. Originally a Jollibee prank bot.
-
----
-
-Signed-in user: @${username} | CWD: ${cwd} | ${date}
-
-## Tools
-
-CRITICAL: When you need to use a tool, you MUST output the tool call immediately. Do NOT say "I'll write that" or "Writing that now..." — just call the tool directly. Describing an action instead of doing it is wrong.
-
-Correct tool call format — output this exactly, on its own line:
-<tool>{"name":"TOOL_NAME","args":{"key":"value"}}</tool>
-
-You will then receive:
-<tool_result name="TOOL_NAME">result</tool_result>
-
-### Writing / Appending Files (ALWAYS use this format — never put file content in JSON)
-<write path="relative/or/C:/absolute/path.ext">
-file content goes here — no escaping needed
-</write>
-
-<append path="path/to/file.txt">
-content to add
-</append>
-
-### Other Tools (JSON format)
-<tool>{"name":"TOOL_NAME","args":{"key":"value"}}</tool>
-
-Available tools:
-- file_read       args: {"path":"string"}
-- file_list       args: {"path":"string"}
-- file_delete     args: {"path":"string"}
-- file_write_docx — Word document. Use this tag format (NEVER put content in JSON):
-  <docx path="C:/path/to/file.docx" title="Optional Title">
-  # Heading 1
-  ## Heading 2
-  Normal paragraph with **bold** and *italic* supported.
-  </docx>
-- web_search      args: {"query":"string"}
-- url_fetch       args: {"url":"string"}
-- run_command     args: {"command":"string"}
-- clipboard_read  args: {}
-- clipboard_write args: {"text":"string"}
-- generate_image  args: {"prompt":"string","width":896,"height":896,"steps":20}
-- prior_feed      args: {}
-- prior_profile   args: {}
-
-### Image generation notes
-- generate_image queues and polls automatically — it can take 1-3 minutes, this is normal
-- Always confirm where the image was saved after it completes
-- If user says "generate X" or "create an image of X", use generate_image immediately
-- Image saves to the current working directory by default; user can ask to move it after
-- When calling generate_image, extract only the core subject/description the user gave. Strip conversational filler ("can you", "please", "I want", "make me", "draw me", etc.). Do NOT add style tags, quality boosters, or extra descriptors like "high detail", "cinematic", "4k", "in motion", "sleek", etc. Pass only what the user described.
-  Examples:
-    "generate car"                    → prompt: "car"
-    "can you make me a sunset"        → prompt: "sunset"
-    "draw a cat sitting on a roof"    → prompt: "cat sitting on a roof"
-    "I want to see a dragon flying"   → prompt: "dragon flying"
-
-${projectContext ? `### Project Context (prior.md)\n${projectContext}\n` : ''}### Rules
-- ACT with tools, don't narrate. If asked to create a file — create it immediately.
-- If the user asks for a Word document (.docx), use the <docx> tag format above — NEVER use file_write for .docx.
-- For file_write / file_append ALWAYS use the <write>/<append> tags above — NEVER put file content inside JSON.
-- Paths relative to CWD unless absolute (e.g. C:/Users/ADMIN/Downloads/file.py)
-- After tool results, give a short confirmation
-- Never output <tool_result> yourself — that comes from the system
-${uncensored ? '- Uncensored mode active\n' : ''}`;
-}
-
-module.exports = { buildSystemPrompt };