@hienlh/ppm 0.7.41 → 0.8.0

package/src/server/ws/chat.ts

@@ -30,6 +30,8 @@ interface SessionEntry {
   catchUpText: string;
   /** Reference to the running stream promise — prevents GC */
   streamPromise?: Promise<void>;
+  /** Sticky permission mode for this session */
+  permissionMode?: string;
 }
 
 /** Tracks active sessions — persists even when FE disconnects */
@@ -78,7 +80,7 @@ function startCleanupTimer(sessionId: string): void {
  * Standalone streaming loop — decoupled from WS message handler.
  * Runs independently so WS close does NOT kill the Claude query.
  */
-async function runStreamLoop(sessionId: string, providerId: string, content: string): Promise<void> {
+async function runStreamLoop(sessionId: string, providerId: string, content: string, permissionMode?: string): Promise<void> {
   const entry = activeSessions.get(sessionId);
   if (!entry) {
     console.error(`[chat] session=${sessionId} runStreamLoop: no entry — aborting`);
@@ -138,7 +140,7 @@ async function runStreamLoop(sessionId: string, providerId: string, content: str
       safeSend(sessionId, { type: "streaming_status", status: "connecting", elapsed });
     }, 5_000);
 
-    for await (const event of chatService.sendMessage(providerId, sessionId, content)) {
+    for await (const event of chatService.sendMessage(providerId, sessionId, content, { permissionMode })) {
       if (abortController.signal.aborted) break;
       eventCount++;
       const ev = event as any;
@@ -369,27 +371,47 @@ export const chatWebSocket = {
       entry0.ws = ws;
     }
 
-    const entry = activeSessions.get(sessionId);
-    const providerId = entry?.providerId ?? providerRegistry.getDefault().id;
+    let entry = activeSessions.get(sessionId);
+
+    // Auto-create entry if missing — handles: message before open (Bun race), or session cleaned up
+    if (!entry) {
+      const { projectName: pn } = ws.data;
+      const session = chatService.getSession(sessionId);
+      const pid = session?.providerId ?? providerRegistry.getDefault().id;
+      let pp: string | undefined;
+      if (pn) { try { pp = resolveProjectPath(pn); } catch { /* ignore */ } }
+      const pi = setInterval(() => {
+        try { ws.send(JSON.stringify({ type: "ping" })); } catch { /* ws may be closed */ }
+      }, PING_INTERVAL_MS);
+      activeSessions.set(sessionId, {
+        providerId: pid, ws, projectPath: pp, projectName: pn,
+        pingInterval: pi, isStreaming: false, needsCatchUp: false, catchUpText: "",
+      });
+      entry = activeSessions.get(sessionId)!;
+      console.log(`[chat] session=${sessionId} auto-created entry in message handler`);
+    }
+
+    const providerId = entry.providerId ?? providerRegistry.getDefault().id;
 
     // Client-initiated handshake — FE sends "ready" after onopen.
     // Re-send status so tunnel connections (Cloudflare) that missed the
     // open-handler message still get connected/status confirmation.
     if (parsed.type === "ready") {
-      if (entry) {
-        ws.send(JSON.stringify({
-          type: "status",
-          sessionId,
-          isStreaming: entry.isStreaming,
-          pendingApproval: entry.pendingApprovalEvent ?? null,
-        }));
-      } else {
-        ws.send(JSON.stringify({ type: "connected", sessionId }));
-      }
+      ws.send(JSON.stringify({
+        type: "status",
+        sessionId,
+        isStreaming: entry.isStreaming,
+        pendingApproval: entry.pendingApprovalEvent ?? null,
+      }));
       return;
     }
 
     if (parsed.type === "message") {
+      // Store permission mode — sticky for this session
+      if (parsed.permissionMode) {
+        entry.permissionMode = parsed.permissionMode;
+      }
+
       // Send immediate feedback BEFORE any async work — prevents "stuck thinking"
       // when resumeSession is slow (e.g. sdkListSessions spawns subprocess on first call)
       safeSend(sessionId, { type: "streaming_status", status: "connecting", elapsed: 0 });
@@ -405,12 +427,12 @@ export const chatWebSocket = {
           logSessionEvent(sessionId, "PERF", `resumeSession took ${elapsed}ms`);
         }
       }
-      if (entry?.projectPath && provider && "ensureProjectPath" in provider) {
+      if (entry.projectPath && provider && "ensureProjectPath" in provider) {
         (provider as any).ensureProjectPath(sessionId, entry.projectPath);
       }
 
       // If already streaming, abort current query first and wait for cleanup
-      if (entry?.isStreaming && entry.abort) {
+      if (entry.isStreaming && entry.abort) {
         console.log(`[chat] session=${sessionId} aborting current query for new message`);
         entry.abort.abort();
         // Wait for stream loop to finish cleanup
@@ -421,16 +443,11 @@ export const chatWebSocket = {
 
       // Store promise reference on entry to prevent GC from collecting the async operation.
       // Use setTimeout(0) to detach from WS handler's async scope.
-      if (entry) {
-        entry.streamPromise = new Promise<void>((resolve) => {
-          setTimeout(() => {
-            runStreamLoop(sessionId, providerId, parsed.content).then(resolve, resolve);
-          }, 0);
-        });
-      } else {
-        console.warn(`[chat] session=${sessionId} no entry when starting stream loop — message may have arrived before open()`);
-        setTimeout(() => runStreamLoop(sessionId, providerId, parsed.content), 0);
-      }
+      entry.streamPromise = new Promise<void>((resolve) => {
+        setTimeout(() => {
+          runStreamLoop(sessionId, providerId, parsed.content, entry.permissionMode).then(resolve, resolve);
+        }, 0);
+      });
     } else if (parsed.type === "cancel") {
       const provider = providerRegistry.get(providerId);
       if (provider && "abortQuery" in provider && typeof (provider as any).abortQuery === "function") {

package/src/services/chat.service.ts

@@ -5,6 +5,7 @@ import type {
   SessionInfo,
   ChatEvent,
   ChatMessage,
+  SendMessageOpts,
 } from "../providers/provider.interface.ts";
 import { MockProvider } from "../providers/mock-provider.ts";
 
@@ -70,13 +71,14 @@ class ChatService {
     providerId: string,
     sessionId: string,
     message: string,
+    opts?: SendMessageOpts,
   ): AsyncIterable<ChatEvent> {
     const provider = providerRegistry.get(providerId);
     if (!provider) {
       yield { type: "error", message: `Provider "${providerId}" not found` };
       return;
     }
-    yield* provider.sendMessage(sessionId, message);
+    yield* provider.sendMessage(sessionId, message, opts);
   }
 
   /** Look up a session across all providers (for WS handler) */

package/src/services/git.service.ts

@@ -199,6 +199,7 @@ class GitService {
       commitHash: info.commit,
       ahead: 0,
       behind: 0,
+      remotes: [],
     }));
   }
 
@@ -232,11 +233,14 @@ class GitService {
   async graphData(
     projectPath: string,
     maxCount = 200,
+    skip = 0,
   ): Promise<GitGraphData> {
     const git = this.git(projectPath);
 
-    // Use simple-git built-in log
-    const log = await git.log({ "--all": null, maxCount });
+    // Use simple-git built-in log with skip support
+    const logOpts: Record<string, unknown> = { "--all": null, maxCount };
+    if (skip > 0) (logOpts as Record<string, unknown>)["--skip"] = skip;
+    const log = await git.log(logOpts);
 
     const commits: GitCommit[] = log.all.map((c) => ({
       hash: c.hash,
@@ -252,10 +256,12 @@ class GitService {
 
     // Get parent hashes via raw format
     try {
+      const skipArgs = skip > 0 ? [`--skip=${skip}`] : [];
       const parentLog = await git.raw([
         "log",
         "--all",
         `--max-count=${maxCount}`,
+        ...skipArgs,
         "--format=%H %P",
       ]);
       const parentMap = new Map<string, string[]>();
@@ -273,13 +279,13 @@ class GitService {
 
     const branchSummary = await git.branch(["-a", "--no-color"]);
 
-    // simple-git branch().commit returns abbreviated hash — map to full hash
+    // simple-git branch().commit returns abbreviated hash of varying lengths — index all common lengths
     const abbrToFull = new Map<string, string>();
     for (const c of commits) {
-      abbrToFull.set(c.abbreviatedHash, c.hash);
-      // Also index with longer prefixes for safety
-      abbrToFull.set(c.hash.slice(0, 8), c.hash);
-      abbrToFull.set(c.hash.slice(0, 10), c.hash);
+      abbrToFull.set(c.hash, c.hash);
+      for (const len of [7, 8, 9, 10, 11, 12]) {
+        abbrToFull.set(c.hash.slice(0, len), c.hash);
+      }
     }
 
     const branches: GitBranch[] = Object.entries(branchSummary.branches).map(
@@ -290,10 +296,41 @@ class GitService {
         commitHash: abbrToFull.get(info.commit) ?? info.commit,
         ahead: 0,
         behind: 0,
+        remotes: [] as string[],
       }),
     );
 
-    return { commits, branches };
+    // Compute remote tracking: for each local branch, find remotes that have it
+    const localBranches = branches.filter((b) => !b.remote);
+    const remoteBranches = branches.filter((b) => b.remote);
+    for (const local of localBranches) {
+      for (const remote of remoteBranches) {
+        // remotes/origin/main → remote="origin", branch="main"
+        const stripped = remote.name.replace(/^remotes\//, "");
+        const slashIdx = stripped.indexOf("/");
+        if (slashIdx < 0) continue;
+        const remoteName = stripped.slice(0, slashIdx);
+        const remoteBranchName = stripped.slice(slashIdx + 1);
+        if (remoteBranchName === local.name) {
+          local.remotes.push(remoteName);
+        }
+      }
+    }
+
+    // Get HEAD commit hash
+    let head = "";
+    try {
+      head = (await git.revparse(["HEAD"])).trim();
+    } catch {
+      // empty repo
+    }
+
+    return { commits, branches, head };
+  }
+
+  async fetch(projectPath: string, remote?: string): Promise<void> {
+    const args = remote ? [remote] : ["--all"];
+    await this.git(projectPath).fetch(args);
   }
 
   async discardChanges(projectPath: string, files: string[]): Promise<void> {

package/src/types/api.ts

@@ -23,7 +23,7 @@ export type TerminalWsMessage =
 
 /** WebSocket message types (chat) */
 export type ChatWsClientMessage =
-  | { type: "message"; content: string }
+  | { type: "message"; content: string; permissionMode?: string }
   | { type: "cancel" }
   | { type: "approval_response"; requestId: string; approved: boolean; reason?: string; data?: unknown };
 

package/src/types/chat.ts

@@ -1,3 +1,7 @@
+export interface SendMessageOpts {
+  permissionMode?: import("./config").PermissionMode | string;
+}
+
 export interface AIProvider {
   id: string;
   name: string;
@@ -8,6 +12,7 @@ export interface AIProvider {
   sendMessage(
     sessionId: string,
     message: string,
+    opts?: SendMessageOpts,
   ): AsyncIterable<ChatEvent>;
   /** Resolve a pending tool/question approval by requestId */
   resolveApproval?(requestId: string, approved: boolean, data?: unknown): void;

package/src/types/config.ts

@@ -40,6 +40,9 @@ export interface AIConfig {
   providers: Record<string, AIProviderConfig>;
 }
 
+const VALID_PERMISSION_MODES = ["default", "acceptEdits", "plan", "bypassPermissions"] as const;
+export type PermissionMode = typeof VALID_PERMISSION_MODES[number];
+
 export interface AIProviderConfig {
   type: "agent-sdk" | "mock";
   api_key_env?: string;
@@ -49,6 +52,8 @@ export interface AIProviderConfig {
   max_turns?: number;
   max_budget_usd?: number;
   thinking_budget_tokens?: number;
+  permission_mode?: PermissionMode;
+  system_prompt?: string;
 }
 
 export const DEFAULT_CONFIG: PpmConfig = {
@@ -67,6 +72,7 @@ export const DEFAULT_CONFIG: PpmConfig = {
         model: "claude-sonnet-4-6",
         effort: "high",
         max_turns: 100,
+        permission_mode: "bypassPermissions",
       },
     },
   },
@@ -100,6 +106,16 @@ export function validateAIProviderConfig(config: Partial<AIProviderConfig>): str
   if (config.thinking_budget_tokens != null && (!Number.isInteger(config.thinking_budget_tokens) || config.thinking_budget_tokens < 0)) {
     errors.push("thinking_budget_tokens must be integer >= 0");
   }
+  if (config.permission_mode != null && !VALID_PERMISSION_MODES.includes(config.permission_mode as any)) {
+    errors.push(`permission_mode must be one of: ${VALID_PERMISSION_MODES.join(", ")}`);
+  }
+  if (config.system_prompt != null) {
+    if (typeof config.system_prompt !== "string") {
+      errors.push("system_prompt must be a string");
+    } else if (config.system_prompt.length > 10000) {
+      errors.push("system_prompt must be 10000 characters or less");
+    }
+  }
   return errors;
 }
 
@@ -143,6 +159,11 @@ export function sanitizeConfig(config: PpmConfig): boolean {
       provider.effort = "high";
       dirty = true;
     }
+    // Fix invalid permission_mode
+    if (provider.permission_mode != null && !["default", "acceptEdits", "plan", "bypassPermissions"].includes(provider.permission_mode)) {
+      provider.permission_mode = "bypassPermissions";
+      dirty = true;
+    }
   }
 
   return dirty;

package/src/types/git.ts

@@ -17,6 +17,8 @@ export interface GitBranch {
   commitHash: string;
   ahead: number;
   behind: number;
+  /** Remote names that track this local branch (e.g. ["origin", "upstream"]) */
+  remotes: string[];
 }
 
 export interface GitStatus {
@@ -35,6 +37,8 @@ export interface GitFileChange {
 export interface GitGraphData {
   commits: GitCommit[];
   branches: GitBranch[];
+  /** Full hash of the currently checked-out commit (HEAD) */
+  head: string;
 }
 
 export interface GitDiffResult {

package/src/web/components/chat/chat-tab.tsx

@@ -1,4 +1,4 @@
-import { useState, useCallback, useRef, useEffect, type DragEvent } from "react";
+import { useState, useCallback, useRef, useEffect } from "react";
 import { Upload, X } from "lucide-react";
 import { api, projectUrl } from "@/lib/api-client";
 import { useChat } from "@/hooks/use-chat";
@@ -8,11 +8,13 @@ import { useSettingsStore } from "@/stores/settings-store";
 import { usePanelStore } from "@/stores/panel-store";
 import { useNotificationStore } from "@/stores/notification-store";
 import { openBugReportPopup } from "@/lib/report-bug";
+import { getAISettings } from "@/lib/api-settings";
 import { MessageList } from "./message-list";
 import { MessageInput, type ChatAttachment } from "./message-input";
 import { SlashCommandPicker, type SlashItem } from "./slash-command-picker";
 import { FilePicker } from "./file-picker";
 import { ChatHistoryBar } from "./chat-history-bar";
+import type { DragEvent } from "react";
 import type { FileNode } from "../../../types/project";
 import type { Session, SessionInfo } from "../../../types/chat";
 
@@ -41,6 +43,11 @@ export function ChatTab({ metadata, tabId }: ChatTabProps) {
   const [fileFilter, setFileFilter] = useState("");
   const [fileSelected, setFileSelected] = useState<FileNode | null>(null);
 
+  // Permission mode — per-session sticky, falls back to global default
+  const [permissionMode, setPermissionMode] = useState<string | undefined>(
+    (metadata?.permissionMode as string) ?? undefined,
+  );
+
   // Drag-and-drop state
   const [isDragging, setIsDragging] = useState(false);
   const [externalFiles, setExternalFiles] = useState<File[] | null>(null);
@@ -55,13 +62,22 @@ export function ChatTab({ metadata, tabId }: ChatTabProps) {
   const { usageInfo, usageLoading, lastFetchedAt, refreshUsage } =
     useUsage(projectName, providerId);
 
-  // Persist sessionId and providerId to tab metadata so reload restores the session
+  // Load global default permission mode on mount (if no per-session override)
+  useEffect(() => {
+    if (permissionMode) return;
+    getAISettings().then((s) => {
+      const provider = s.providers[s.default_provider ?? "claude"];
+      setPermissionMode(provider?.permission_mode ?? "bypassPermissions");
+    }).catch(() => {});
+  }, []); // eslint-disable-line react-hooks/exhaustive-deps
+
+  // Persist sessionId, providerId, and permissionMode to tab metadata
   useEffect(() => {
     if (!tabId || !sessionId) return;
     updateTab(tabId, {
-      metadata: { ...metadata, sessionId, providerId },
+      metadata: { ...metadata, sessionId, providerId, permissionMode },
     });
-  }, [sessionId, providerId]); // eslint-disable-line react-hooks/exhaustive-deps
+  }, [sessionId, providerId, permissionMode]); // eslint-disable-line react-hooks/exhaustive-deps
 
   const {
     messages,
@@ -116,7 +132,7 @@ export function ChatTab({ metadata, tabId }: ChatTabProps) {
       const msg = pendingForkMsgRef.current;
       pendingForkMsgRef.current = undefined;
       if (tabId) updateTab(tabId, { metadata: { ...metadata, pendingMessage: undefined } });
-      setTimeout(() => sendMessage(msg), 100);
+      setTimeout(() => sendMessage(msg, { permissionMode }), 100);
     }
   }, [isConnected, sessionId]); // eslint-disable-line react-hooks/exhaustive-deps
 
@@ -194,7 +210,7 @@ export function ChatTab({ metadata, tabId }: ChatTabProps) {
           setSessionId(session.id);
           setProviderId(session.providerId);
           setTimeout(() => {
-            sendMessage(fullContent);
+            sendMessage(fullContent, { permissionMode });
           }, 500);
           return;
         } catch (e) {
@@ -202,9 +218,9 @@ export function ChatTab({ metadata, tabId }: ChatTabProps) {
           return;
         }
       }
-      sendMessage(fullContent);
+      sendMessage(fullContent, { permissionMode });
     },
-    [sessionId, providerId, projectName, sendMessage, buildMessageWithAttachments],
+    [sessionId, providerId, projectName, sendMessage, buildMessageWithAttachments, permissionMode],
   );
 
   // --- Slash picker handlers ---
@@ -358,6 +374,8 @@ export function ChatTab({ metadata, tabId }: ChatTabProps) {
           onFileItemsLoaded={setFileItems}
           fileSelected={fileSelected}
           externalFiles={externalFiles}
+          permissionMode={permissionMode}
+          onModeChange={setPermissionMode}
         />
       </div>
 

package/src/web/components/chat/message-input.tsx

@@ -4,6 +4,7 @@ import { api, projectUrl, getAuthToken } from "@/lib/api-client";
 import { randomId } from "@/lib/utils";
 import { isSupportedFile, isImageFile } from "@/lib/file-support";
 import { AttachmentChips } from "./attachment-chips";
+import { ModeSelector, getModeLabel, getModeIcon } from "./mode-selector";
 import type { SlashItem } from "./slash-command-picker";
 import type { FileNode } from "../../../types/project";
 import { flattenFileTree } from "./file-picker";
@@ -37,6 +38,10 @@ interface MessageInputProps {
   externalFiles?: File[] | null;
   /** Pre-fill input value (e.g. from command palette "Ask AI") */
   initialValue?: string;
+  /** Current permission mode */
+  permissionMode?: string;
+  /** Permission mode change handler */
+  onModeChange?: (mode: string) => void;
 }
 
 export function MessageInput({
@@ -53,9 +58,12 @@ export function MessageInput({
   fileSelected,
   externalFiles,
   initialValue,
+  permissionMode,
+  onModeChange,
 }: MessageInputProps) {
   const [value, setValue] = useState(initialValue ?? "");
   const [attachments, setAttachments] = useState<ChatAttachment[]>([]);
+  const [modeSelectorOpen, setModeSelectorOpen] = useState(false);
   const textareaRef = useRef<HTMLTextAreaElement>(null);
   const mobileTextareaRef = useRef<HTMLTextAreaElement>(null);
   const fileInputRef = useRef<HTMLInputElement>(null);
@@ -276,9 +284,18 @@ export function MessageInput({
       if (e.key === "Enter" && !e.shiftKey) {
         e.preventDefault();
         handleSend();
+        return;
+      }
+      // Shift+Tab: cycle permission mode
+      if (e.shiftKey && e.key === "Tab") {
+        e.preventDefault();
+        const modeIds = ["default", "acceptEdits", "plan", "bypassPermissions"];
+        const idx = modeIds.indexOf(permissionMode ?? "bypassPermissions");
+        const next = modeIds[(idx + 1) % modeIds.length]!;
+        onModeChange?.(next);
       }
     },
-    [handleSend],
+    [handleSend, permissionMode, onModeChange],
   );
 
   const updatePickerState = useCallback(
@@ -389,6 +406,19 @@ export function MessageInput({
       >
         {/* Attachment chips (inside container, aligned with input) */}
         <AttachmentChips attachments={attachments} onRemove={removeAttachment} />
+        {/* Mobile: mode chip row */}
+        <div className="flex items-center gap-1 px-2 pt-2 md:hidden relative">
+          <ModeChip
+            mode={permissionMode ?? "bypassPermissions"}
+            onClick={() => setModeSelectorOpen((v) => !v)}
+          />
+          <ModeSelector
+            value={permissionMode ?? "bypassPermissions"}
+            onChange={(m) => onModeChange?.(m)}
+            open={modeSelectorOpen}
+            onOpenChange={setModeSelectorOpen}
+          />
+        </div>
         {/* Mobile: single row — attach + textarea + send */}
         <div className="flex items-end gap-1 md:hidden px-2 py-2">
           <button
@@ -459,6 +489,19 @@ export function MessageInput({
               >
                 <Paperclip className="size-4" />
               </button>
+              {/* Mode indicator chip */}
+              <div className="relative">
+                <ModeChip
+                  mode={permissionMode ?? "bypassPermissions"}
+                  onClick={() => setModeSelectorOpen((v) => !v)}
+                />
+                <ModeSelector
+                  value={permissionMode ?? "bypassPermissions"}
+                  onChange={(m) => onModeChange?.(m)}
+                  open={modeSelectorOpen}
+                  onOpenChange={setModeSelectorOpen}
+                />
+              </div>
             </div>
             <div className="flex items-center gap-1">
               {showCancel ? (
@@ -488,3 +531,20 @@ export function MessageInput({
     </div>
   );
 }
+
+/** Small chip showing current permission mode */
+function ModeChip({ mode, onClick }: { mode: string; onClick: () => void }) {
+  const Icon = getModeIcon(mode);
+  const label = getModeLabel(mode);
+  return (
+    <button
+      type="button"
+      onClick={(e) => { e.stopPropagation(); onClick(); }}
+      className="inline-flex items-center gap-1 px-2 py-1 rounded-md text-[11px] text-text-subtle hover:text-text-primary hover:bg-surface-elevated transition-colors border border-transparent hover:border-border"
+      aria-label={`Permission mode: ${label}`}
+    >
+      <Icon className="size-3" />
+      <span className="max-w-[100px] truncate">{label}</span>
+    </button>
+  );
+}

package/src/web/components/chat/message-list.tsx

@@ -153,6 +153,11 @@ function MessageBubble({ message, isStreaming, projectName, onFork }: { message:
 /** Image extensions that can be previewed inline */
 const IMAGE_EXTS = new Set([".png", ".jpg", ".jpeg", ".gif", ".webp"]);
 
+/** Strip system-injected XML tags (e.g. <system-reminder>, <available-deferred-tools>) from message content */
+function stripSystemTags(text: string): string {
+  return text.replace(/<(system-reminder|available-deferred-tools|antml:[\w-]+|fast_mode_info|claudeMd|gitStatus|currentDate)[\s\S]*?<\/\1>/g, "").trim();
+}
+
 /** Parse user message content, extracting attached file paths and the actual text */
 function parseUserAttachments(content: string): { files: string[]; text: string } {
   // Match: [Attached file: /path] or [Attached files:\n/path1\n/path2\n]
@@ -190,7 +195,10 @@ function isPdfPath(path: string): boolean {
 
 /** User message bubble with attachment rendering */
 function UserBubble({ content, projectName, onFork }: { content: string; projectName?: string; onFork?: () => void }) {
-  const { files, text } = useMemo(() => parseUserAttachments(content), [content]);
+  const { files, text } = useMemo(() => {
+    const parsed = parseUserAttachments(content);
+    return { files: parsed.files, text: stripSystemTags(parsed.text) };
+  }, [content]);
 
   return (
     <div className="flex justify-end group/user">