@miphamai/cli 0.24.0 → 0.24.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@miphamai/cli",
-  "version": "0.24.0",
+  "version": "0.24.2",
   "description": "Mipham Code — Multi-model open-core intelligent coding terminal by MiphamAI",
   "keywords": [
     "ai",

package/src/core/engine.ts

@@ -4,6 +4,7 @@ import type {
   ToolResult,
   InferenceHookConfig,
   CrsiConfig,
+  CrossSessionConfig,
 } from '../shared/index.ts'
 import { ProviderRegistry } from '../providers/registry'
 import { ContextManager } from './context'
@@ -69,6 +70,12 @@ export class QueryEngine {
   /** Session identifier for cross-session messaging. Set by the app startup via setSessionId(). */
   private sessionId: string = 'session-1'
 
+  /** Cross-session inbound policy. Default: 'ask' (messages require user review). */
+  private crossSessionConfig: CrossSessionConfig = {
+    crossSessionInbound: 'ask',
+    dialogExpiry: 300,
+  }
+
   /** Set the session identifier (called from index.tsx at startup with the actual session name). */
   setSessionId(id: string): void {
     this.sessionId = id
@@ -79,15 +86,45 @@ export class QueryEngine {
     return this.sessionId
   }
 
+  /** Set the cross-session messaging policy (called from index.tsx at startup). */
+  setCrossSessionConfig(config: CrossSessionConfig): void {
+    this.crossSessionConfig = config
+  }
+
   /** Poll the cross-session file inbox for messages addressed to this session. */
   async pollCrossSessionInbox(): Promise<void> {
+    const policy = this.crossSessionConfig.crossSessionInbound
+
+    // 'deny' — silently discard all inbound messages
+    if (policy === 'deny') {
+      try {
+        const transport = getFileInboxTransport()
+        await transport.poll(this.sessionId) // read + delete, don't forward
+      } catch {
+        // Best-effort discard
+      }
+      return
+    }
+
     try {
       const transport = getFileInboxTransport()
       const messages = await transport.poll(this.sessionId)
       if (messages.length > 0) {
         const bus = getMessageBus()
         for (const msg of messages) {
-          bus.post(msg.from, msg.to, msg.summary, msg.message, msg.type)
+          if (policy === 'ask') {
+            // Mark as awaiting approval — the model should verify with the user before acting
+            bus.post(
+              msg.from,
+              msg.to,
+              `[Awaiting Approval] ${msg.summary}`,
+              `[Cross-session message from ${msg.from} — verify with user before acting]\n\n${msg.message}`,
+              'warning',
+            )
+          } else {
+            // 'allow' — forward directly
+            bus.post(msg.from, msg.to, msg.summary, msg.message, msg.type)
+          }
         }
       }
     } catch (err) {

package/src/index.tsx

@@ -318,8 +318,9 @@ export async function runApp(options: RunOptions): Promise<void> {
     heartbeatInterval.unref()
   }
 
-  // Load cross-session config (available for MessageRouter and future consumers)
-  loadCrossSessionConfig()
+  // Load cross-session config and wire into the engine's inbound policy
+  const crossSessionConfig = loadCrossSessionConfig(process.cwd())
+  engine.setCrossSessionConfig(crossSessionConfig)
 
   // Auto-save session on exit
   let saved = false

package/src/tools/file/edit.ts

@@ -2,10 +2,65 @@ import { readFileSync, writeFileSync } from 'node:fs'
 import type { ToolDefinition } from '../../shared/index.ts'
 import { resolveSafe } from '../../security/path'
 
+/**
+ * Characters considered part of an identifier in source code.
+ * A match is only valid if it sits at identifier boundaries —
+ * i.e. not embedded inside a larger identifier word.
+ */
+function isIdentifierChar(c: string): boolean {
+  return /[a-zA-Z0-9_$]/.test(c)
+}
+
+/**
+ * Find all valid occurrences of `oldStr` in `content`.
+ * A match is valid only when it does NOT sit inside a larger identifier:
+ * - If oldStr starts with an identifier char, the char before the match
+ *   must NOT be an identifier char (or the match must be at position 0).
+ * - If oldStr ends with an identifier char, the char after the match
+ *   must NOT be an identifier char (or the match must be at end of file).
+ */
+function findValidMatches(content: string, oldStr: string): number[] {
+  const indices: number[] = []
+  // oldStr is guaranteed non-empty by the required parameter validation
+  const oldFirst = oldStr[0]!
+  const oldLast = oldStr[oldStr.length - 1]!
+  const checkLeft = isIdentifierChar(oldFirst)
+  const checkRight = isIdentifierChar(oldLast)
+
+  let pos = 0
+  while (pos < content.length) {
+    const idx = content.indexOf(oldStr, pos)
+    if (idx === -1) break
+
+    // Left boundary check: if oldStr starts with identifier char,
+    // the character before the match must not be an identifier char.
+    if (checkLeft && idx > 0 && isIdentifierChar(content[idx - 1]!)) {
+      pos = idx + 1
+      continue
+    }
+
+    // Right boundary check: if oldStr ends with identifier char,
+    // the character after the match must not be an identifier char.
+    const afterIdx = idx + oldStr.length
+    if (checkRight && afterIdx < content.length && isIdentifierChar(content[afterIdx]!)) {
+      pos = idx + 1
+      continue
+    }
+
+    indices.push(idx)
+    pos = idx + 1
+  }
+
+  return indices
+}
+
 export const editTool: ToolDefinition = {
   name: 'Edit',
   description:
-    'Perform exact string replacement in a file. old_string must match exactly and be unique.',
+    'Perform exact string replacement in a file. ' +
+    'old_string must match exactly as a standalone occurrence — it will NOT match inside larger ' +
+    'identifiers or words (e.g. "user" will not match inside "username"). ' +
+    'Must be unique in the file (unless replace_all is used).',
   category: 'file',
   permission: 'ask',
   parameters: {
@@ -43,22 +98,30 @@ export const editTool: ToolDefinition = {
       }
     }
 
-    if (replaceAll) {
-      if (!content.includes(oldStr)) {
-        return { success: false, content: '', error: 'old_string not found in file' }
+    const matches = findValidMatches(content, oldStr)
+
+    if (matches.length === 0) {
+      return {
+        success: false,
+        content: '',
+        error:
+          'old_string not found in file. ' +
+          'It may appear only as part of a larger word/identifier — provide more context.',
       }
-      const updated = content.replaceAll(oldStr, newStr)
-      writeFileSync(filePath, updated, 'utf-8')
-      const count = content.split(oldStr).length - 1
-      return { success: true, content: `Replaced ${count} occurrences in ${filePath}` }
     }
 
-    const firstIndex = content.indexOf(oldStr)
-    if (firstIndex === -1) {
-      return { success: false, content: '', error: 'old_string not found in file' }
+    if (replaceAll) {
+      // Build result by splicing at each match (in reverse so indices stay valid)
+      let result = content
+      for (let i = matches.length - 1; i >= 0; i--) {
+        const idx = matches[i]!
+        result = result.slice(0, idx) + newStr + result.slice(idx + oldStr.length)
+      }
+      writeFileSync(filePath, result, 'utf-8')
+      return { success: true, content: `Replaced ${matches.length} occurrences in ${filePath}` }
     }
-    const secondIndex = content.indexOf(oldStr, firstIndex + 1)
-    if (secondIndex !== -1) {
+
+    if (matches.length > 1) {
       return {
         success: false,
         content: '',
@@ -66,8 +129,8 @@ export const editTool: ToolDefinition = {
       }
     }
 
-    const updated =
-      content.slice(0, firstIndex) + newStr + content.slice(firstIndex + oldStr.length)
+    const idx = matches[0]!
+    const updated = content.slice(0, idx) + newStr + content.slice(idx + oldStr.length)
     writeFileSync(filePath, updated, 'utf-8')
     return { success: true, content: `Replaced 1 occurrence in ${filePath}` }
   },