codeclaw 0.2.4 → 0.2.5

package/dist/bot-telegram.js

@@ -105,7 +105,72 @@ const ARTIFACT_PHOTO_EXTS = new Set(['.jpg', '.jpeg', '.png', '.webp']);
 function isPhotoFilename(filename) {
     return ARTIFACT_PHOTO_EXTS.has(path.extname(filename).toLowerCase());
 }
-function buildArtifactPrompt(prompt, artifactDir, manifestPath) {
+export function collectArtifacts(dirPath, manifestPath, log) {
+    const _log = log || (() => { });
+    if (!fs.existsSync(manifestPath))
+        return [];
+    let parsed;
+    try {
+        parsed = JSON.parse(fs.readFileSync(manifestPath, 'utf-8'));
+    }
+    catch (e) {
+        _log(`artifact manifest parse error: ${e}`);
+        return [];
+    }
+    const entries = Array.isArray(parsed) ? parsed : Array.isArray(parsed?.files) ? parsed.files : [];
+    if (!entries.length)
+        return [];
+    const realDir = fs.realpathSync(dirPath);
+    const artifacts = [];
+    for (const entry of entries.slice(0, ARTIFACT_MAX_FILES)) {
+        const rawPath = typeof entry?.path === 'string' ? entry.path
+            : typeof entry?.name === 'string' ? entry.name
+                : '';
+        const relPath = rawPath.trim();
+        if (!relPath || path.isAbsolute(relPath)) {
+            _log(`artifact skipped: invalid path "${rawPath}"`);
+            continue;
+        }
+        const resolved = path.resolve(dirPath, relPath);
+        const relative = path.relative(dirPath, resolved);
+        if (!relative || relative.startsWith('..') || path.isAbsolute(relative)) {
+            _log(`artifact skipped: outside turn dir "${relPath}"`);
+            continue;
+        }
+        if (!fs.existsSync(resolved)) {
+            _log(`artifact skipped: missing file "${relPath}"`);
+            continue;
+        }
+        const realFile = fs.realpathSync(resolved);
+        const realRelative = path.relative(realDir, realFile);
+        if (realRelative.startsWith('..') || path.isAbsolute(realRelative)) {
+            _log(`artifact skipped: symlink outside turn dir "${relPath}"`);
+            continue;
+        }
+        const stat = fs.statSync(realFile);
+        if (!stat.isFile()) {
+            _log(`artifact skipped: not a file "${relPath}"`);
+            continue;
+        }
+        if (stat.size > ARTIFACT_MAX_BYTES) {
+            _log(`artifact skipped: too large "${relPath}" (${stat.size} bytes)`);
+            continue;
+        }
+        const filename = path.basename(realFile);
+        const requestedKind = typeof entry?.kind === 'string' ? entry.kind.toLowerCase()
+            : typeof entry?.type === 'string' ? entry.type.toLowerCase()
+                : '';
+        let kind = requestedKind === 'document' ? 'document'
+            : requestedKind === 'photo' ? 'photo'
+                : isPhotoFilename(filename) ? 'photo' : 'document';
+        if (kind === 'photo' && !isPhotoFilename(filename))
+            kind = 'document';
+        const caption = typeof entry?.caption === 'string' ? entry.caption.trim().slice(0, 1024) || undefined : undefined;
+        artifacts.push({ filePath: realFile, filename, kind, caption });
+    }
+    return artifacts;
+}
+export function buildArtifactPrompt(prompt, artifactDir, manifestPath) {
     const base = prompt.trim() || 'Please help with this request.';
     return [
         base,
@@ -409,12 +474,17 @@ export class TelegramBot extends Bot {
         const baseArgs = ensureNonInteractiveRestartArgs(bin, rawArgs);
         const allArgs = [...baseArgs, ...process.argv.slice(2)];
         this.log(`restart: spawning \`${bin} ${allArgs.join(' ')}\``);
+        // Collect all known chat IDs so the new process can send startup notices
+        const knownIds = new Set(this.allowedChatIds);
+        for (const cid of this.channel.knownChats)
+            knownIds.add(cid);
         const child = spawn(bin, allArgs, {
             stdio: 'inherit',
             detached: true,
             env: {
                 ...process.env,
                 npm_config_yes: process.env.npm_config_yes || 'true',
+                ...(knownIds.size ? { TELEGRAM_ALLOWED_CHAT_IDS: [...knownIds].join(',') } : {}),
             },
         });
         child.unref();
@@ -494,68 +564,7 @@ export class TelegramBot extends Bot {
         fs.rmSync(dirPath, { recursive: true, force: true });
     }
     collectArtifacts(dirPath, manifestPath) {
-        if (!fs.existsSync(manifestPath))
-            return [];
-        let parsed;
-        try {
-            parsed = JSON.parse(fs.readFileSync(manifestPath, 'utf-8'));
-        }
-        catch (e) {
-            this.log(`artifact manifest parse error: ${e}`);
-            return [];
-        }
-        const entries = Array.isArray(parsed) ? parsed : Array.isArray(parsed?.files) ? parsed.files : [];
-        if (!entries.length)
-            return [];
-        const realDir = fs.realpathSync(dirPath);
-        const artifacts = [];
-        for (const entry of entries.slice(0, ARTIFACT_MAX_FILES)) {
-            const rawPath = typeof entry?.path === 'string' ? entry.path
-                : typeof entry?.name === 'string' ? entry.name
-                    : '';
-            const relPath = rawPath.trim();
-            if (!relPath || path.isAbsolute(relPath)) {
-                this.log(`artifact skipped: invalid path "${rawPath}"`);
-                continue;
-            }
-            const resolved = path.resolve(dirPath, relPath);
-            const relative = path.relative(dirPath, resolved);
-            if (!relative || relative.startsWith('..') || path.isAbsolute(relative)) {
-                this.log(`artifact skipped: outside turn dir "${relPath}"`);
-                continue;
-            }
-            if (!fs.existsSync(resolved)) {
-                this.log(`artifact skipped: missing file "${relPath}"`);
-                continue;
-            }
-            const realFile = fs.realpathSync(resolved);
-            const realRelative = path.relative(realDir, realFile);
-            if (realRelative.startsWith('..') || path.isAbsolute(realRelative)) {
-                this.log(`artifact skipped: symlink outside turn dir "${relPath}"`);
-                continue;
-            }
-            const stat = fs.statSync(realFile);
-            if (!stat.isFile()) {
-                this.log(`artifact skipped: not a file "${relPath}"`);
-                continue;
-            }
-            if (stat.size > ARTIFACT_MAX_BYTES) {
-                this.log(`artifact skipped: too large "${relPath}" (${stat.size} bytes)`);
-                continue;
-            }
-            const filename = path.basename(realFile);
-            const requestedKind = typeof entry?.kind === 'string' ? entry.kind.toLowerCase()
-                : typeof entry?.type === 'string' ? entry.type.toLowerCase()
-                    : '';
-            let kind = requestedKind === 'document' ? 'document'
-                : requestedKind === 'photo' ? 'photo'
-                    : isPhotoFilename(filename) ? 'photo' : 'document';
-            if (kind === 'photo' && !isPhotoFilename(filename))
-                kind = 'document';
-            const caption = typeof entry?.caption === 'string' ? entry.caption.trim().slice(0, 1024) || undefined : undefined;
-            artifacts.push({ filePath: realFile, filename, kind, caption });
-        }
-        return artifacts;
+        return collectArtifacts(dirPath, manifestPath, msg => this.log(msg));
     }
     async sendArtifacts(ctx, replyTo, artifacts) {
         for (const artifact of artifacts) {

package/dist/bot.js

@@ -8,7 +8,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { execSync, spawn } from 'node:child_process';
 import { doStream, getSessions, getUsage, listAgents, } from './code-agent.js';
-export const VERSION = '0.2.4';
+export const VERSION = '0.2.5';
 // ---------------------------------------------------------------------------
 // Helpers
 // ---------------------------------------------------------------------------
@@ -235,9 +235,10 @@ export class Bot {
         else if (cs.agent === 'codex') {
             this.log(`[runStream] codex config: model=${this.codexModel} reasoning=${this.codexReasoningEffort} fullAccess=${this.codexFullAccess} extraArgs=[${this.codexExtraArgs.join(' ')}]`);
         }
+        const snapshotSessionId = cs.sessionId;
         const opts = {
             agent: cs.agent, prompt, workdir: this.workdir, timeout: this.runTimeout,
-            sessionId: cs.sessionId, model: null, thinkingEffort: this.codexReasoningEffort, onText,
+            sessionId: snapshotSessionId, model: null, thinkingEffort: this.codexReasoningEffort, onText,
             attachments: attachments.length ? attachments : undefined,
             codexModel: this.codexModel, codexFullAccess: this.codexFullAccess,
             codexExtraArgs: this.codexExtraArgs.length ? this.codexExtraArgs : undefined,
@@ -252,7 +253,8 @@ export class Bot {
             this.stats.totalOutputTokens += result.outputTokens;
         if (result.cachedInputTokens)
             this.stats.totalCachedTokens += result.cachedInputTokens;
-        if (result.sessionId)
+        // Only update sessionId if it hasn't been changed externally (e.g. user switched session during run)
+        if (result.sessionId && cs.sessionId === snapshotSessionId)
             cs.sessionId = result.sessionId;
         this.log(`[runStream] completed turn=${this.stats.totalTurns} cumulative: in=${fmtTokens(this.stats.totalInputTokens)} out=${fmtTokens(this.stats.totalOutputTokens)} cached=${fmtTokens(this.stats.totalCachedTokens)}`);
         return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeclaw",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "The best IM-driven remote coding experience. Bridge AI coding agents to any IM.",
   "type": "module",
   "bin": {