@ducci/jarvis 1.0.12 → 1.0.14

package/docs/system-prompt.md

@@ -2,13 +2,17 @@
 
 This is the authoritative system prompt sent to the model at the start of every session. It is stored as the first message (`role: "system"`) in the conversation history.
 
-Before sending to the model, the server replaces the `{{user_info}}` placeholder with the current contents of `user-info.json`. This happens at runtime on every request — the placeholder is never stored in the conversation history.
+Before sending to the model, the server replaces the `{{user_info}}` and `{{session_id}}` placeholders at runtime on every request — these are never stored in the conversation history.
 
 ---
 
 ```
 You are Jarvis, a fully autonomous agent running on a local server. You have access to tools and can execute shell commands on the machine you run on.
 
+## Session
+
+Current session ID: {{session_id}}
+
 ## Known User Context
 
 {{user_info}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ducci/jarvis",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "description": "A fully automated agent system that lives on a server.",
   "main": "./src/index.js",
   "type": "module",

package/src/index.js

@@ -180,6 +180,30 @@ program
     }
   });
 
+program
+  .command('restart')
+  .description('Restart the Jarvis server (starts it if not running).')
+  .action(async () => {
+    preflight();
+    try {
+      await connectPm2();
+      const desc = await pm2Describe().catch(() => []);
+      const isRunning = desc.length > 0 && desc[0].pm2_env?.status === 'online';
+      if (isRunning) {
+        await pm2Restart();
+        console.log('Jarvis server restarted.');
+      } else {
+        await pm2Start();
+        console.log('Jarvis server started.');
+      }
+      pm2.disconnect();
+    } catch (e) {
+      console.error('Failed to restart Jarvis server:', e.message);
+      pm2.disconnect();
+      process.exit(1);
+    }
+  });
+
 program
   .command('status')
   .description('Display the status of the Jarvis server.')

package/src/server/agent.js

@@ -330,7 +330,7 @@ export async function handleChat(config, requestSessionId, userMessage) {
   function prepareMessages(messages) {
     return messages.map((msg, i) => {
       if (i === 0 && msg.role === 'system') {
-        return { ...msg, content: resolveSystemPrompt(msg.content) };
+        return { ...msg, content: resolveSystemPrompt(msg.content, sessionId) };
       }
       return msg;
     });

package/src/server/config.js

@@ -63,7 +63,7 @@ export function loadSystemPrompt() {
   return match[1].trim();
 }
 
-export function resolveSystemPrompt(promptTemplate) {
+export function resolveSystemPrompt(promptTemplate, sessionId) {
   let userInfo = '(none yet)';
   try {
     const raw = fs.readFileSync(PATHS.userInfoFile, 'utf8');
@@ -74,5 +74,7 @@ export function resolveSystemPrompt(promptTemplate) {
   } catch {
     // File doesn't exist yet
   }
-  return promptTemplate.replace('{{user_info}}', userInfo);
+  return promptTemplate
+    .replace('{{session_id}}', sessionId || 'unknown')
+    .replace('{{user_info}}', userInfo);
 }