terminal-quest 1.2.2 → 1.3.0

package/dist/App.js

@@ -26,6 +26,10 @@ export function App() {
                 return _jsx(ProgressScreen, { progress: progress, onNavigate: navigateTo });
             case 'settings':
                 return _jsx(SettingsScreen, { onNavigate: navigateTo, onReset: resetAll });
+            default: {
+                const _exhaustive = screen;
+                return _jsx(TitleScreen, { onNavigate: navigateTo });
+            }
         }
     };
     return _jsx(Box, { flexDirection: "column", children: renderScreen() });

package/dist/engine/CommandHandler.d.ts

@@ -7,11 +7,11 @@ export declare class CommandHandler {
     private executePipeline;
     private executeSingle;
     private extractRedirect;
-    private splitOnPipe;
+    splitOnPipe(input: string): string[];
     /**
      * Tokenize input string, handling single and double quotes.
      * Quoted strings preserve internal spaces. Quotes are removed from the result.
      */
-    private tokenize;
+    tokenize(input: string): string[];
 }
 //# sourceMappingURL=CommandHandler.d.ts.map

package/dist/engine/CommandHandler.js

@@ -54,7 +54,14 @@ export class CommandHandler {
         const finalArgs = stdin != null && stdin !== ''
             ? [...args, `__stdin__:${stdin}`]
             : args;
-        const result = commandFn(this.fs, finalArgs);
+        let result;
+        try {
+            result = commandFn(this.fs, finalArgs);
+        }
+        catch (e) {
+            const msg = e instanceof Error ? e.message : String(e);
+            return { output: '', error: `${commandName}: ${msg}` };
+        }
         // Handle redirect
         if (redirect && !result.error) {
             try {

package/dist/engine/VirtualFS.js

@@ -210,6 +210,14 @@ export class VirtualFS {
         const srcNode = this.getNode(src);
         if (!srcNode)
             throw new Error(`No such file or directory: ${src}`);
+        const resolvedSrc = this.resolvePath(src);
+        const resolvedDest = this.resolvePath(dest);
+        if (resolvedDest === resolvedSrc) {
+            throw new Error(`'${src}' and '${dest}' are the same file`);
+        }
+        if (resolvedDest.startsWith(resolvedSrc + '/')) {
+            throw new Error(`Cannot move '${src}' to a subdirectory of itself`);
+        }
         const cloned = this.deepClone(srcNode);
         if (this.exists(dest) && this.isDirectory(dest)) {
             const srcParts = this.resolvePath(src).split('/').filter(Boolean);

package/dist/engine/commands/chmod.js

@@ -24,7 +24,8 @@ export function chmod(fs, args) {
         fs.setPermissions(filePath, newPerms);
     }
     catch (e) {
-        return { output: '', error: `chmod: ${e.message}` };
+        const msg = e instanceof Error ? e.message : String(e);
+        return { output: '', error: `chmod: ${msg}` };
     }
     return { output: '' };
 }

package/dist/engine/commands/cut.js

@@ -57,7 +57,8 @@ export function cut(fs, args) {
             content = fs.readFile(files[0]);
         }
         catch (e) {
-            return { output: '', error: `cut: ${e.message}` };
+            const msg = e instanceof Error ? e.message : String(e);
+            return { output: '', error: `cut: ${msg}` };
         }
     }
     else if (stdin !== undefined) {

package/dist/engine/commands/echo.js

@@ -1,4 +1,8 @@
 export function echo(_fs, args) {
+    const stdinIdx = args.findIndex(a => a.startsWith('__stdin__:'));
+    if (stdinIdx !== -1) {
+        args = [...args.slice(0, stdinIdx), ...args.slice(stdinIdx + 1)];
+    }
     return { output: args.join(' ') };
 }
 //# sourceMappingURL=echo.js.map

package/dist/engine/commands/git.js

@@ -181,7 +181,13 @@ function gitStash(fs, args) {
         if (!fs.exists(stashPath)) {
             return { output: '', error: 'No stash entries found.' };
         }
-        const entry = JSON.parse(fs.readFile(stashPath));
+        let entry;
+        try {
+            entry = JSON.parse(fs.readFile(stashPath));
+        }
+        catch {
+            return { output: '', error: 'error: corrupt stash entry' };
+        }
         // Restore state
         if (entry.status) {
             fs.writeFile('.git/status', entry.status);
@@ -207,8 +213,13 @@ function gitStash(fs, args) {
         for (let i = stashCount - 1; i >= 0; i--) {
             const stashPath = `.git/stash-stack/${i}`;
             if (fs.exists(stashPath)) {
-                const entry = JSON.parse(fs.readFile(stashPath));
-                lines.push(`stash@{${stashCount - 1 - i}}: WIP on ${entry.branch}`);
+                try {
+                    const entry = JSON.parse(fs.readFile(stashPath));
+                    lines.push(`stash@{${stashCount - 1 - i}}: WIP on ${entry.branch}`);
+                }
+                catch {
+                    lines.push(`stash@{${stashCount - 1 - i}}: (corrupt entry)`);
+                }
             }
         }
         return { output: lines.join('\n') };

package/dist/engine/commands/head.js

@@ -41,7 +41,8 @@ export function head(fs, args) {
             content = fs.readFile(files[0]);
         }
         catch (e) {
-            return { output: '', error: `head: ${e.message}` };
+            const msg = e instanceof Error ? e.message : String(e);
+            return { output: '', error: `head: ${msg}` };
         }
     }
     else if (stdin !== undefined) {

package/dist/engine/commands/index.js

@@ -6,8 +6,6 @@ import { grep } from './grep.js';
 import { cp } from './cp.js';
 import { echo } from './echo.js';
 import { help } from './help.js';
-import { hint } from './hint.js';
-import { clear } from './clear.js';
 import { git } from './git.js';
 import { mkdir } from './mkdir.js';
 import { mv } from './mv.js';
@@ -31,8 +29,6 @@ export const commandRegistry = {
     cp,
     echo,
     help,
-    hint,
-    clear,
     git,
     mkdir,
     mv,

package/dist/engine/commands/mkdir.js

@@ -23,7 +23,8 @@ export function mkdir(fs, args) {
             fs.mkdir(path, recursive);
         }
         catch (e) {
-            return { output: '', error: `mkdir: ${e.message}` };
+            const msg = e instanceof Error ? e.message : String(e);
+            return { output: '', error: `mkdir: ${msg}` };
         }
     }
     return { output: '' };

package/dist/engine/commands/mv.js

@@ -8,7 +8,8 @@ export function mv(fs, args) {
         fs.move(source, dest);
     }
     catch (e) {
-        return { output: '', error: `mv: ${e.message}` };
+        const msg = e instanceof Error ? e.message : String(e);
+        return { output: '', error: `mv: ${msg}` };
     }
     return { output: '' };
 }

package/dist/engine/commands/rm.js

@@ -40,7 +40,8 @@ export function rm(fs, args) {
         }
         catch (e) {
             if (!force) {
-                return { output: '', error: `rm: ${e.message}` };
+                const msg = e instanceof Error ? e.message : String(e);
+                return { output: '', error: `rm: ${msg}` };
             }
         }
     }

package/dist/engine/commands/sort.js

@@ -59,7 +59,8 @@ export function sort(fs, args) {
             content = fs.readFile(files[0]);
         }
         catch (e) {
-            return { output: '', error: `sort: ${e.message}` };
+            const msg = e instanceof Error ? e.message : String(e);
+            return { output: '', error: `sort: ${msg}` };
         }
     }
     else if (stdin !== undefined) {
@@ -83,8 +84,8 @@ export function sort(fs, args) {
         lines.sort((a, b) => {
             const ka = getKey(a);
             const kb = getKey(b);
-            const na = parseFloat(ka) || 0;
-            const nb = parseFloat(kb) || 0;
+            const na = isNaN(parseFloat(ka)) ? 0 : parseFloat(ka);
+            const nb = isNaN(parseFloat(kb)) ? 0 : parseFloat(kb);
             return na - nb;
         });
     }

package/dist/engine/commands/tail.js

@@ -41,7 +41,8 @@ export function tail(fs, args) {
             content = fs.readFile(files[0]);
         }
         catch (e) {
-            return { output: '', error: `tail: ${e.message}` };
+            const msg = e instanceof Error ? e.message : String(e);
+            return { output: '', error: `tail: ${msg}` };
         }
     }
     else if (stdin !== undefined) {

package/dist/engine/commands/touch.js

@@ -11,7 +11,8 @@ export function touch(fs, args) {
         fs.writeFile(filename, '');
     }
     catch (e) {
-        return { output: '', error: `touch: ${e.message}` };
+        const msg = e instanceof Error ? e.message : String(e);
+        return { output: '', error: `touch: ${msg}` };
     }
     return { output: '' };
 }

package/dist/engine/commands/uniq.js

@@ -27,7 +27,8 @@ export function uniq(fs, args) {
             content = fs.readFile(files[0]);
         }
         catch (e) {
-            return { output: '', error: `uniq: ${e.message}` };
+            const msg = e instanceof Error ? e.message : String(e);
+            return { output: '', error: `uniq: ${msg}` };
         }
     }
     else if (stdin !== undefined) {

package/dist/engine/commands/wc.js

@@ -44,7 +44,8 @@ export function wc(fs, args) {
                 content = fs.readFile(filename);
             }
             catch (e) {
-                return { output: '', error: `wc: ${e.message}` };
+                const msg = e instanceof Error ? e.message : String(e);
+                return { output: '', error: `wc: ${msg}` };
             }
             const lines = content === '' ? 0 : (content.match(/\n/g) || []).length;
             const words = content === '' ? 0 : content.split(/\s+/).filter(Boolean).length;

package/dist/screens/TerminalScreen.js

@@ -47,6 +47,7 @@ export function TerminalScreen({ storyId, missionIndex, onNavigate, onMissionCom
     const [currentHint, setCurrentHint] = useState(null);
     const [hintLevel, setHintLevel] = useState(0);
     const commandCountRef = useRef(0);
+    const missionCompleteTriggeredRef = useRef(false);
     const [cmdsHintShown, setCmdsHintShown] = useState(new Set());
     useInput((input, key) => {
         if (key.escape) {
@@ -95,6 +96,10 @@ export function TerminalScreen({ storyId, missionIndex, onNavigate, onMissionCom
             handleHintRequest();
             return;
         }
+        if (trimmed === 'clear') {
+            setOutputLines([]);
+            return;
+        }
         if (trimmed === 'objectives' || trimmed === 'obj') {
             mission.objectives.forEach((obj, i) => {
                 const done = completedObjectives.includes(obj.id);
@@ -141,10 +146,6 @@ export function TerminalScreen({ storyId, missionIndex, onNavigate, onMissionCom
             return;
         }
         const result = commandHandler.execute(trimmed);
-        if (result.output === 'CLEAR_SCREEN') {
-            setOutputLines([]);
-            return;
-        }
         if (result.error) {
             let errorText = result.error;
             if (course === 'kids' && errorText.endsWith(': command not found')) {
@@ -178,13 +179,15 @@ export function TerminalScreen({ storyId, missionIndex, onNavigate, onMissionCom
                 }
             }
         }
-        // Parse all commands in pipe chain for objective checking
-        const pipeSegments = trimmed.split('|').map(s => s.trim()).filter(s => s);
+        // Parse all commands in pipe chain for objective checking (quote-aware)
+        const pipeSegments = commandHandler.splitOnPipe(trimmed).map(s => s.trim()).filter(s => s);
         let allNewlyCompleted = [];
         for (const segment of pipeSegments) {
-            const parts = segment.split(/\s+/);
-            const cmd = parts[0];
-            const args = parts.slice(1);
+            const tokens = commandHandler.tokenize(segment);
+            if (tokens.length === 0)
+                continue;
+            const cmd = tokens[0];
+            const args = tokens.slice(1);
             const newlyCompleted = missionEngine.checkObjectives(cmd, args, result.output);
             allNewlyCompleted.push(...newlyCompleted);
         }
@@ -200,7 +203,8 @@ export function TerminalScreen({ storyId, missionIndex, onNavigate, onMissionCom
                 }
             }
             setCurrentHint(null);
-            if (missionEngine.isAllComplete()) {
+            if (missionEngine.isAllComplete() && !missionCompleteTriggeredRef.current) {
+                missionCompleteTriggeredRef.current = true;
                 const finalCount = commandCountRef.current;
                 setTimeout(() => {
                     onMissionComplete(storyId, mission.id, hintEngine.getTotalHintsUsed(), finalCount);

package/dist/state/ProgressStore.js

@@ -1,22 +1,42 @@
-import { readFileSync, writeFileSync, mkdirSync, existsSync } from 'fs';
+import { readFileSync, writeFileSync, mkdirSync, existsSync, copyFileSync } from 'fs';
 import { join } from 'path';
 import { homedir } from 'os';
 import { initialProgress } from './GameState.js';
 const SAVE_DIR = join(homedir(), '.terminal-quest');
 const SAVE_FILE = join(SAVE_DIR, 'progress.json');
+let saveWarningShown = false;
+function migrateProgress(parsed) {
+    return {
+        completedStories: Array.isArray(parsed.completedStories) ? parsed.completedStories : [],
+        storyProgress: (parsed.storyProgress && typeof parsed.storyProgress === 'object') ? parsed.storyProgress : {},
+        totalCommandsExecuted: typeof parsed.totalCommandsExecuted === 'number' ? parsed.totalCommandsExecuted : 0,
+        totalHintsUsed: typeof parsed.totalHintsUsed === 'number' ? parsed.totalHintsUsed : 0,
+        achievements: Array.isArray(parsed.achievements) ? parsed.achievements : [],
+    };
+}
 export function loadProgress() {
     try {
         if (!existsSync(SAVE_FILE))
             return { ...initialProgress };
         const data = readFileSync(SAVE_FILE, 'utf-8');
         const parsed = JSON.parse(data);
-        // Migration: add achievements if missing
-        if (!parsed.achievements) {
-            parsed.achievements = [];
+        if (!parsed || typeof parsed !== 'object') {
+            throw new Error('Invalid progress file format');
         }
-        return parsed;
+        return migrateProgress(parsed);
     }
-    catch {
+    catch (e) {
+        const msg = e instanceof Error ? e.message : String(e);
+        process.stderr.write(`[terminal-quest] 進捗ファイルの読み込みに失敗しました: ${msg}\n` +
+            `新しい進捗データで開始します。\n`);
+        try {
+            if (existsSync(SAVE_FILE)) {
+                const backupPath = SAVE_FILE + '.backup.' + Date.now();
+                copyFileSync(SAVE_FILE, backupPath);
+                process.stderr.write(`[terminal-quest] バックアップを保存しました: ${backupPath}\n`);
+            }
+        }
+        catch { /* backup is best-effort */ }
         return { ...initialProgress };
     }
 }
@@ -26,9 +46,15 @@ export function saveProgress(progress) {
             mkdirSync(SAVE_DIR, { recursive: true });
         }
         writeFileSync(SAVE_FILE, JSON.stringify(progress, null, 2), 'utf-8');
+        saveWarningShown = false;
     }
-    catch {
-        // 保存失敗は無視（ゲーム継続可能）
+    catch (e) {
+        if (!saveWarningShown) {
+            const msg = e instanceof Error ? e.message : String(e);
+            process.stderr.write(`[terminal-quest] 進捗の保存に失敗しました: ${msg}\n` +
+                `進捗データが保持されない可能性があります。\n`);
+            saveWarningShown = true;
+        }
     }
 }
 export function resetProgress() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminal-quest",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "description": "ストーリー駆動型ターミナルコマンド学習CLI - Learn terminal commands through interactive stories",
   "type": "module",
   "main": "dist/index.js",