illusion-code 0.2.5__tar.gz → 0.2.7__tar.gz

{illusion_code-0.2.5 → illusion_code-0.2.7}/.github/workflows/publish.yml

@@ -10,6 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: read
+      id-token: write
 
     steps:
       - uses: actions/checkout@v4
@@ -43,7 +44,4 @@ jobs:
         run: twine check dist/*
 
       - name: Publish to PyPI
-        env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
-        run: twine upload dist/*
+        uses: pypa/gh-action-pypi-publish@release/v1

{illusion_code-0.2.5 → illusion_code-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: illusion-code
-Version: 0.2.5
+Version: 0.2.7
 Summary: Open-source Python port of Claude Code - an AI-powered CLI coding assistant
 Project-URL: Homepage, https://github.com/YunTaiHua/illusion-code
 Project-URL: Repository, https://github.com/YunTaiHua/illusion-code

{illusion_code-0.2.5 → illusion_code-0.2.7}/frontend/terminal/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@illusion/terminal",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@illusion/terminal",
-      "version": "0.2.5",
+      "version": "0.2.7",
       "dependencies": {
         "chalk": "^5.6.2",
         "ink": "^5.1.0",

{illusion_code-0.2.5 → illusion_code-0.2.7}/frontend/terminal/package.json

@@ -24,5 +24,5 @@
     "tsx": "^4.19.2",
     "typescript": "^5.7.3"
   },
-  "version": "0.2.5"
+  "version": "0.2.7"
 }

{illusion_code-0.2.5 → illusion_code-0.2.7}/frontend/terminal/src/components/ConversationView.tsx

@@ -680,12 +680,15 @@ function wrapForPrefix(text: string, terminalWidth: number, prefix: string): str
 }
 
 function truncateToDisplayWidth(text: string, maxWidth: number): string {
-	if (stringWidth(text) <= maxWidth) {
-		return text;
+	// 将 tab 替换为空格，因为 string-width 将 tab 算作1字符宽度，
+	// 但终端中 tab 会展开为多个空格，导致宽度计算偏小、截断不足
+	const expanded = text.replace(/\t/g, '        ');
+	if (stringWidth(expanded) <= maxWidth) {
+		return expanded;
 	}
 	let result = '';
 	let width = 0;
-	for (const ch of text) {
+	for (const ch of expanded) {
 		const charWidth = stringWidth(ch);
 		if (width + charWidth > Math.max(1, maxWidth - 1)) {
 			break;

{illusion_code-0.2.5 → illusion_code-0.2.7}/frontend/terminal/src/components/TodoPanel.tsx

@@ -41,10 +41,6 @@ export function TodoPanel({items}: {items: TodoItemSnapshot[]}): React.JSX.Eleme
 	const hideTimerRef = useRef<NodeJS.Timeout | null>(null);
 	const completionTimeRef = useRef<Record<string, number>>({});
 
-	if (items.length === 0 || hidden) {
-		return <></>;
-	}
-
 	const completed = items.filter((t) => t.status === 'completed').length;
 	const inProgress = items.filter((t) => t.status === 'in_progress').length;
 	const pending = items.filter((t) => t.status === 'pending').length;
@@ -58,7 +54,7 @@ export function TodoPanel({items}: {items: TodoItemSnapshot[]}): React.JSX.Eleme
 		}
 	}
 
-	// 所有任务完成后延迟隐藏
+	// 所有任务完成后延迟隐藏（必须在所有条件 return 之前，遵守 Hooks 规则）
 	useEffect(() => {
 		if (allDone) {
 			if (hideTimerRef.current === null) {
@@ -82,6 +78,11 @@ export function TodoPanel({items}: {items: TodoItemSnapshot[]}): React.JSX.Eleme
 		};
 	}, [allDone]);
 
+	// 条件 return 放在 useEffect 之后，避免违反 React Hooks 规则
+	if (items.length === 0 || hidden) {
+		return <></>;
+	}
+
 	// 排序：最近完成 > in_progress > pending > 较早完成
 	const sorted = [...items].sort((a, b) => {
 		const aRecent = a.status === 'completed' && (now - (completionTimeRef.current[a.content] ?? 0)) < RECENT_COMPLETED_TTL_MS;

{illusion_code-0.2.5 → illusion_code-0.2.7}/frontend/terminal/src/version.ts

@@ -6,4 +6,4 @@
  */
 
 /** 当前版本号 */
-export const VERSION = '0.2.5';
+export const VERSION = '0.2.7';

{illusion_code-0.2.5 → illusion_code-0.2.7}/frontend/web/index.html

@@ -8,7 +8,7 @@
     <link href="https://fonts.googleapis.com/css2?family=Inter:opsz,wght@14..32,100..900&family=JetBrains+Mono:ital,wght@0,100..800;1,100..800&display=swap" rel="stylesheet" />
     <title>Illusion Code</title>
   </head>
-  <body class="bg-white">
+  <body>
     <div id="root"></div>
     <script type="module" src="/src/main.tsx"></script>
   </body>

{illusion_code-0.2.5 → illusion_code-0.2.7}/frontend/web/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@illusion/web",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@illusion/web",
-      "version": "0.2.5",
+      "version": "0.2.7",
       "dependencies": {
         "highlight.js": "^11.11.0",
         "react": "^18.3.1",

{illusion_code-0.2.5 → illusion_code-0.2.7}/frontend/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@illusion/web",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "private": true,
   "type": "module",
   "scripts": {

{illusion_code-0.2.5 → illusion_code-0.2.7}/frontend/web/src/App.tsx

@@ -53,20 +53,35 @@ export default function App() {
   // 内联选项状态
   const [inlineOptions, setInlineOptions] = useState<SelectRequestPayload | null>(null);
 
+  // 回退确认弹窗状态
+  const [rewindConfirm, setRewindConfirm] = useState<{ turns: number } | null>(null);
+  // 重新生成：存储待重发的 user 消息文本，rewind 完成后自动重发
+  const pendingRegenerateRef = useRef<string | null>(null);
+  const prevBusyRef = useRef(false);
+
   // Toast 状态
   const [toastMessage, setToastMessage] = useState<{ text: string; type: 'success' | 'error' | 'info' } | null>(null);
+  const [toastExiting, setToastExiting] = useState(false);
   const toastTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
   const toastHoverRef = useRef(false);
+  const toastKeyRef = useRef(0);
+
+  const closeToast = useCallback(() => {
+    setToastExiting(true);
+    setTimeout(() => { setToastMessage(null); setToastExiting(false); }, 200);
+  }, []);
 
   const showToast = useCallback((text: string, type: string) => {
     if (toastTimerRef.current) clearTimeout(toastTimerRef.current);
+    toastKeyRef.current += 1;
+    setToastExiting(false);
     setToastMessage({ text, type: type as 'success' | 'error' | 'info' });
     toastHoverRef.current = false;
     toastTimerRef.current = setTimeout(() => {
-      if (!toastHoverRef.current) { setToastMessage(null); }
+      if (!toastHoverRef.current) { closeToast(); }
       toastTimerRef.current = null;
     }, TOAST_DURATION);
-  }, []);
+  }, [closeToast]);
 
   const handleToastMouseEnter = useCallback(() => {
     toastHoverRef.current = true;
@@ -75,8 +90,8 @@ export default function App() {
 
   const handleToastMouseLeave = useCallback(() => {
     toastHoverRef.current = false;
-    toastTimerRef.current = setTimeout(() => { setToastMessage(null); toastTimerRef.current = null; }, TOAST_DURATION);
-  }, []);
+    toastTimerRef.current = setTimeout(() => { closeToast(); toastTimerRef.current = null; }, TOAST_DURATION);
+  }, [closeToast]);
 
   /**
    * 注册回调函数
@@ -222,6 +237,57 @@ export default function App() {
   /** 处理停止当前任务 */
   const handleStop = () => { session.sendRequest({ type: 'stop' }); };
 
+  /**
+   * 处理回退到指定轮次
+   *
+   * 由 ChatArea 中 user 消息的撤销按钮触发，弹出模式选择弹窗。
+   *
+   * @param turnsToRewind - 需要回退的轮次数
+   */
+  const handleRewindToTurn = useCallback((turnsToRewind: number) => {
+    setRewindConfirm({ turns: turnsToRewind });
+  }, []);
+
+  /**
+   * 确认回退 —— 根据用户选择的模式执行 /rewind N mode
+   *
+   * 通过 submit_line 通道（treat_as_text 缺省=false）直接走命令注册表，
+   * 绕过 web_query 的多步弹窗流程。
+   *
+   * @param mode - 回退模式：code / conversation / both
+   */
+  const handleConfirmRewind = useCallback((mode: string) => {
+    const turns = rewindConfirm?.turns ?? 1;
+    setRewindConfirm(null);
+    session.setBusyTrue();
+    session.sendRequest({ type: 'submit_line', line: `/rewind ${turns} ${mode}` });
+  }, [rewindConfirm, session]);
+
+  /**
+   * 处理重新生成
+   *
+   * 找到最后一条 user 消息文本，先 /rewind 1 both 回退一轮，
+   * rewind 完成后（busy→false）自动重发 user 消息。
+   */
+  const handleRegenerate = useCallback(() => {
+    const lastUserMsg = [...session.staticItems].reverse().find((i) => i.role === 'user' && !i.text.startsWith('/'));
+    if (!lastUserMsg) return;
+    pendingRegenerateRef.current = lastUserMsg.text;
+    session.setBusyTrue();
+    session.sendRequest({ type: 'submit_line', line: '/rewind 1 both' });
+  }, [session]);
+
+  // 监听 busy 状态变化：rewind 完成后自动重发 user 消息（重新生成）
+  useEffect(() => {
+    if (prevBusyRef.current && !session.busy && pendingRegenerateRef.current) {
+      const text = pendingRegenerateRef.current;
+      pendingRegenerateRef.current = null;
+      session.setBusyTrue();
+      session.sendRequest({ type: 'submit_line', line: text, treat_as_text: true });
+    }
+    prevBusyRef.current = session.busy;
+  }, [session.busy, session]);
+
   /** 处理新建会话 */
   const handleNewSession = () => {
     session.sendRequest({ type: 'web_new_session' });
@@ -317,7 +383,7 @@ export default function App() {
   };
 
   return (
-    <div className="flex h-screen bg-surface-main">
+    <div className="flex h-screen">
       <Sidebar lang={lang} connected={session.connected} sessions={session.sessions}
         onNewSession={handleNewSession} onSelectSession={handleSelectSession}
         onListSessions={handleListSessions}
@@ -336,7 +402,8 @@ export default function App() {
           streamingReasoning={session.streamingReasoning} pendingToolCalls={session.pendingToolCalls}
           busy={session.busy} connected={session.connected}
           modal={session.modal} onPermissionResponse={handlePermissionResponse}
-          onQuestionResponse={handleQuestionResponse} restoringSessionId={session.restoringSessionId} />
+          onQuestionResponse={handleQuestionResponse} restoringSessionId={session.restoringSessionId}
+          onRewindToTurn={handleRewindToTurn} onRegenerate={handleRegenerate} />
         <PromptInput lang={lang} busy={session.busy} connected={session.connected}
           commands={session.commands} onSubmit={handleSubmit} onStop={handleStop}
           inlineOptions={inlineOptions} onInlineSelect={handleInlineSelect} onInlineClose={handleInlineClose} />
@@ -363,8 +430,8 @@ export default function App() {
       {/* 删除会话弹窗（仅 sidebar 触发） */}
       {showDeleteModal && (
         <div className="fixed inset-0 z-50 flex items-center justify-center">
-          <div className="absolute inset-0 bg-black/30 backdrop-blur-sm" onClick={handleCloseDeleteModal} />
-          <div className="relative bg-white rounded-xl shadow-2xl border border-border-light w-[420px] max-h-[70vh] flex flex-col">
+          <div className="absolute inset-0 bg-black/35 backdrop-blur-md animate-fade-in" onClick={handleCloseDeleteModal} />
+          <div className="relative glass-overlay rounded-2xl w-[420px] max-h-[70vh] flex flex-col animate-scale-in modal-origin-center">
             <div className="px-6 py-4 border-b border-border-light">
               <h3 className="text-lg font-semibold text-content-primary">{t(lang, 'delete_session')}</h3>
             </div>
@@ -372,7 +439,7 @@ export default function App() {
               {regularSessions.length === 0 ? (
                 <div className="px-6 py-8 text-center text-sm text-content-disabled">{t(lang, 'no_sessions')}</div>
               ) : regularSessions.map((s) => (
-                <label key={s.value} className="flex items-center gap-3 px-6 py-3 cursor-pointer hover:bg-surface-hover transition-colors">
+                <label key={s.value} className="flex items-center gap-3 px-6 py-3 cursor-pointer glass-option-hover transition-colors rounded-lg mx-1">
                   <input type="checkbox" checked={deleteSelected.has(s.value)} onChange={() => toggleDeleteItem(s.value)} className="w-4 h-4 rounded accent-danger" />
                   <span className="text-sm text-content-secondary truncate flex-1">{s.label}</span>
                 </label>
@@ -384,10 +451,10 @@ export default function App() {
                   // 直接删除全部；后端会原子化地新建空会话，避免两阶段竞态
                   session.deleteSessions([], true);
                   setDeleteModalOpen(false); setDeleteSelected(new Set());
-                }} className="px-4 py-2 text-sm text-danger hover:bg-red-50 rounded-lg transition-colors cursor-pointer">{t(lang, 'delete_all')}</button>
+                }} className="danger-action px-4 py-2 text-sm text-danger rounded-lg cursor-pointer">{t(lang, 'delete_all')}</button>
               )}</div>
               <div className="flex gap-2">
-                <button onClick={handleCloseDeleteModal} className="px-4 py-2 text-sm text-content-secondary hover:bg-surface-hover rounded-lg transition-colors cursor-pointer border border-border-light">{t(lang, 'cancel')}</button>
+                <button onClick={handleCloseDeleteModal} className="px-4 py-2 text-sm text-content-secondary glass-option-hover rounded-lg transition-colors cursor-pointer border border-white/40">{t(lang, 'cancel')}</button>
                 <button onClick={handleConfirmDelete} disabled={deleteSelected.size === 0}
                   className="px-4 py-2 text-sm text-white bg-danger hover:bg-danger-hover rounded-lg transition-colors cursor-pointer disabled:opacity-40 disabled:cursor-not-allowed">
                   {t(lang, 'confirm_delete')} ({deleteSelected.size})
@@ -398,18 +465,68 @@ export default function App() {
         </div>
       )}
 
+      {/* 回退确认弹窗（选择回退范围） */}
+      {rewindConfirm && (
+        <div className="fixed inset-0 z-50 flex items-center justify-center">
+          <div className="absolute inset-0 bg-black/35 backdrop-blur-md animate-fade-in" onClick={() => setRewindConfirm(null)} />
+          <div className="relative glass-overlay rounded-2xl w-[380px] flex flex-col animate-scale-in modal-origin-center">
+            <div className="px-6 py-4 border-b border-border-light">
+              <h3 className="text-lg font-semibold text-content-primary">{t(lang, 'rewind_confirm_title')}</h3>
+            </div>
+            <div className="py-2 px-1">
+              {([
+                { mode: 'both', label: t(lang, 'rewind_both'), desc: t(lang, 'rewind_both_desc') },
+                { mode: 'conversation', label: t(lang, 'rewind_conversation'), desc: t(lang, 'rewind_conversation_desc') },
+                { mode: 'code', label: t(lang, 'rewind_code'), desc: t(lang, 'rewind_code_desc') },
+              ] as const).map((opt) => (
+                <button
+                  key={opt.mode}
+                  onClick={() => handleConfirmRewind(opt.mode)}
+                  className="w-full text-left px-6 py-3 cursor-pointer glass-option-hover transition-colors rounded-lg flex items-center justify-between group"
+                >
+                  <div>
+                    <div className="text-sm font-medium text-content-primary">{opt.label}</div>
+                    <div className="text-xs text-content-disabled mt-0.5">{opt.desc}</div>
+                  </div>
+                  <svg className="w-4 h-4 text-content-disabled opacity-0 group-hover:opacity-100 transition-opacity" viewBox="0 0 16 16" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round">
+                    <path d="M6 3l5 5-5 5" />
+                  </svg>
+                </button>
+              ))}
+            </div>
+            <div className="px-6 py-4 border-t border-border-light flex justify-end">
+              <button onClick={() => setRewindConfirm(null)} className="px-4 py-2 text-sm text-content-secondary glass-option-hover rounded-lg transition-colors cursor-pointer border border-white/40">
+                {t(lang, 'cancel')}
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
+
       {/* Toast 通知 */}
       {toastMessage && (
-        <div className="fixed bottom-20 right-6 z-50 animate-fade-in"
-          onMouseEnter={handleToastMouseEnter} onMouseLeave={handleToastMouseLeave}>
-          <div className="bg-white rounded-lg shadow-lg px-4 py-3 max-w-sm">
-            <div className="flex items-start gap-3">
+        <div
+          key={toastKeyRef.current}
+          className={`fixed bottom-20 right-6 z-50 ${toastExiting ? 'animate-toast-out' : 'animate-toast-in'}`}
+          onMouseEnter={handleToastMouseEnter} onMouseLeave={handleToastMouseLeave}
+        >
+          <div className="glass-surface border border-black/10 rounded-2xl max-w-sm overflow-hidden">
+            <div className="flex items-start gap-3 px-4 py-3">
               <pre className="text-sm text-content-primary whitespace-pre-wrap font-mono leading-relaxed flex-1 max-h-40 overflow-y-auto">{toastMessage.text}</pre>
-              <button onClick={() => setToastMessage(null)}
-                className="shrink-0 w-5 h-5 flex items-center justify-center rounded text-content-disabled hover:text-content-primary hover:bg-surface-hover transition-colors cursor-pointer">
+              <button onClick={closeToast}
+                className="shrink-0 w-5 h-5 flex items-center justify-center rounded text-content-disabled hover:text-content-primary glass-option-hover transition-colors cursor-pointer">
                 <svg width="10" height="10" viewBox="0 0 12 12" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round"><path d="M2 2l8 8M10 2l-8 8" /></svg>
               </button>
             </div>
+            <div className="h-0.5 bg-black/10">
+              <div
+                key={toastKeyRef.current}
+                className={`h-full animate-progress-shrink ${
+                  toastMessage.type === 'error' ? 'bg-danger/80' : toastMessage.type === 'success' ? 'bg-success/80' : 'bg-primary/80'
+                }`}
+                style={{ animationDuration: `${TOAST_DURATION}ms` }}
+              />
+            </div>
           </div>
         </div>
       )}