atcoder-workspace 1.1.0-beta.1 → 1.1.0-beta.3

package/dist/cli.js

@@ -69,8 +69,8 @@ const lang = (0, i18n_1.getLanguage)(workspaceRoot);
 const program = new commander_1.Command();
 program
     .name('atc')
-    .description('AtCoder All-in-One CLI (Local-first)')
-    .version('1.1.0-betas');
+    .description('AtCoder Workspace')
+    .version('1.1.0-beta.3');
 function handleAction(fn) {
     return async (...args) => {
         try {
@@ -237,47 +237,97 @@ program
         setupSpinner.stop((0, i18n_1.t)('newSetupSuccess', lang, tObj.label.toUpperCase(), res.sampleCount));
     }
     p.outro(picocolors_1.default.green((0, i18n_1.t)('newScaffoldingComplete', lang, selectedTasks.length)));
+    if (config.extractProblemStatement) {
+        p.note((0, i18n_1.t)('newStatementWarningBody', lang), picocolors_1.default.yellow((0, i18n_1.t)('newStatementWarningTitle', lang)));
+    }
 }));
-function resolveArgs(workspaceRoot, taskArg, fileArg) {
+function resolveArgs(workspaceRoot, arg1, arg2, arg3) {
+    const cwd = process.cwd();
+    const config = (0, config_store_1.loadConfig)(workspaceRoot);
+    const contestDir = config.contestDir || '';
     let resolvedTaskDir = '';
     let resolvedFile;
-    let isFile = false;
-    let filePath = '';
-    if (taskArg) {
-        const pathsToCheck = [
-            path.resolve(taskArg),
-            path.resolve(workspaceRoot, taskArg)
+    // Helper function to check if relative path parts exist in cwd, workspaceRoot or contestDir
+    function checkPath(relativeParts) {
+        const pathsToTry = [
+            path.resolve(cwd, ...relativeParts),
+            path.resolve(workspaceRoot, ...relativeParts),
+            path.resolve(workspaceRoot, contestDir, ...relativeParts)
         ];
-        const config = (0, config_store_1.loadConfig)(workspaceRoot);
-        if (config.contestDir) {
-            pathsToCheck.push(path.resolve(workspaceRoot, config.contestDir, taskArg));
-        }
-        for (const p of pathsToCheck) {
-            if (fs.existsSync(p) && fs.statSync(p).isFile()) {
-                isFile = true;
-                filePath = p;
-                break;
+        for (const p of pathsToTry) {
+            if (fs.existsSync(p)) {
+                const stat = fs.statSync(p);
+                return {
+                    isFile: stat.isFile(),
+                    isDir: stat.isDirectory(),
+                    path: p
+                };
             }
         }
+        return null;
+    }
+    // 1. Three arguments provided: (arg1, arg2, arg3)
+    if (arg1 && arg2 && arg3) {
+        // e.g., abc300 a main.cpp -> check if arg1/arg2 is a directory
+        const checkDir = checkPath([arg1, arg2]);
+        if (checkDir && checkDir.isDir) {
+            resolvedTaskDir = checkDir.path;
+            resolvedFile = arg3;
+        }
     }
-    if (isFile) {
-        resolvedFile = path.basename(filePath);
-        resolvedTaskDir = path.dirname(filePath);
+    // 2. Two arguments provided: (arg1, arg2)
+    if (!resolvedTaskDir && arg1 && arg2) {
+        // Pattern A: arg1/arg2 is a directory (e.g., abc300 a)
+        const checkDir = checkPath([arg1, arg2]);
+        if (checkDir && checkDir.isDir) {
+            resolvedTaskDir = checkDir.path;
+            resolvedFile = undefined;
+        }
+        else {
+            // Pattern B: arg1 is a directory, arg2 is a file (e.g., a main.cpp)
+            const checkArg1 = checkPath([arg1]);
+            if (checkArg1 && checkArg1.isDir) {
+                resolvedTaskDir = checkArg1.path;
+                resolvedFile = arg2;
+            }
+        }
     }
-    else {
-        resolvedTaskDir = (0, runner_1.resolveTaskDirectory)(workspaceRoot, taskArg);
-        resolvedFile = fileArg;
+    // 3. One argument provided: (arg1)
+    if (!resolvedTaskDir && arg1) {
+        const checkArg1 = checkPath([arg1]);
+        if (checkArg1) {
+            if (checkArg1.isFile) {
+                // Pattern A: directly specified a file (e.g., main.cpp)
+                resolvedTaskDir = path.dirname(checkArg1.path);
+                resolvedFile = path.basename(checkArg1.path);
+            }
+            else if (checkArg1.isDir) {
+                // Pattern B: directly specified a directory (e.g., a or abc300/a)
+                resolvedTaskDir = checkArg1.path;
+                resolvedFile = undefined;
+            }
+        }
+        else {
+            // Fallback to resolveTaskDirectory (legacy behavior)
+            resolvedTaskDir = (0, runner_1.resolveTaskDirectory)(workspaceRoot, arg1);
+            resolvedFile = undefined;
+        }
+    }
+    // 4. No arguments provided
+    if (!resolvedTaskDir) {
+        resolvedTaskDir = (0, runner_1.resolveTaskDirectory)(workspaceRoot, undefined);
+        resolvedFile = undefined;
     }
     const taskLabel = path.basename(resolvedTaskDir);
     const contestId = path.basename(path.dirname(resolvedTaskDir));
     return { resolvedTaskDir, resolvedFile, taskLabel, contestId };
 }
 program
-    .command('test [task] [file]')
+    .command('test [arg1] [arg2] [arg3]')
     .description((0, i18n_1.t)('descTest', lang))
-    .action(handleAction(async (taskArg, fileArg) => {
+    .action(handleAction(async (arg1, arg2, arg3) => {
     const workspaceRoot = (0, finder_1.findWorkspaceRoot)();
-    const { resolvedTaskDir, resolvedFile, taskLabel, contestId } = resolveArgs(workspaceRoot, taskArg, fileArg);
+    const { resolvedTaskDir, resolvedFile, taskLabel, contestId } = resolveArgs(workspaceRoot, arg1, arg2, arg3);
     p.intro(picocolors_1.default.cyan((0, i18n_1.t)('testIntro', lang, contestId, taskLabel)));
     const s = p.spinner();
     s.start((0, i18n_1.t)('testRetrievingLimits', lang));
@@ -355,11 +405,11 @@ program
     }
 }));
 program
-    .command('submit [task] [file]')
+    .command('submit [arg1] [arg2] [arg3]')
     .description((0, i18n_1.t)('descSubmit', lang))
-    .action(handleAction(async (taskArg, fileArg) => {
+    .action(handleAction(async (arg1, arg2, arg3) => {
     const workspaceRoot = (0, finder_1.findWorkspaceRoot)();
-    const { resolvedTaskDir, resolvedFile, taskLabel, contestId } = resolveArgs(workspaceRoot, taskArg, fileArg);
+    const { resolvedTaskDir, resolvedFile, taskLabel, contestId } = resolveArgs(workspaceRoot, arg1, arg2, arg3);
     p.intro(picocolors_1.default.cyan((0, i18n_1.t)('submitPreparing', lang, contestId, taskLabel)));
     const s = p.spinner();
     s.start((0, i18n_1.t)('submitRetrievingLimits', lang));
@@ -491,11 +541,22 @@ program
         p.log.error(picocolors_1.default.red((0, i18n_1.t)('langWorkspaceRequired', lang)));
         process.exit(1);
     }
-    if (!targetLanguage) {
-        console.log((0, i18n_1.t)('langCommandUsage', lang));
-        process.exit(0);
+    let selectedLang = targetLanguage;
+    if (!selectedLang) {
+        const choice = await p.select({
+            message: (0, i18n_1.t)('langSelectMessage', lang),
+            options: [
+                { value: 'en', label: 'English (en)' },
+                { value: 'ja', label: '日本語 (ja)' }
+            ]
+        });
+        if (p.isCancel(choice)) {
+            p.cancel((0, i18n_1.t)('langCancelled', lang));
+            process.exit(0);
+        }
+        selectedLang = choice;
     }
-    const cleanLang = targetLanguage.trim().toLowerCase();
+    const cleanLang = selectedLang.trim().toLowerCase();
     if (cleanLang !== 'en' && cleanLang !== 'ja') {
         p.log.error(picocolors_1.default.red((0, i18n_1.t)('langInvalid', lang)));
         process.exit(1);
@@ -505,4 +566,86 @@ program
     (0, config_store_1.saveConfig)(workspaceRoot, config);
     p.log.success((0, i18n_1.t)('langSuccess', cleanLang, cleanLang));
 }));
+program
+    .command('add-lang [langName]')
+    .description((0, i18n_1.t)('descAddLang', lang))
+    .action(handleAction(async (langName) => {
+    const root = (0, finder_1.findWorkspaceRoot)();
+    const config = (0, config_store_1.loadConfig)(root);
+    let targetLang = langName;
+    if (!targetLang) {
+        targetLang = await p.text({
+            message: (0, i18n_1.t)('addLangEnterName', lang),
+            validate: (val) => (!val.trim() ? (0, i18n_1.t)('addLangNameNotEmpty', lang) : undefined)
+        });
+        if (p.isCancel(targetLang)) {
+            p.cancel((0, i18n_1.t)('addLangCancelled', lang));
+            process.exit(0);
+        }
+    }
+    targetLang = targetLang.trim().toLowerCase();
+    // Check if already exists
+    if (config.languages[targetLang]) {
+        throw new errors_1.AtcError((0, i18n_1.t)('addLangAlreadyExists', lang, targetLang));
+    }
+    const preset = initializer_1.LANGUAGE_PRESETS[targetLang];
+    let extension = '';
+    let build = '';
+    let run = '';
+    let template = '';
+    if (preset) {
+        extension = preset.config.extension;
+        build = preset.config.build;
+        run = preset.config.run;
+        template = preset.template;
+    }
+    else {
+        // If not preset, prompt for parameters
+        const extInput = await p.text({
+            message: (0, i18n_1.t)('addLangEnterExtension', lang, targetLang),
+            placeholder: targetLang,
+            validate: (val) => (!val.trim() ? (0, i18n_1.t)('addLangExtNotEmpty', lang) : undefined)
+        });
+        if (p.isCancel(extInput)) {
+            p.cancel((0, i18n_1.t)('addLangCancelled', lang));
+            process.exit(0);
+        }
+        const buildInput = await p.text({
+            message: (0, i18n_1.t)('addLangEnterBuildCmd', lang),
+            placeholder: 'e.g. g++ -O2 main.cpp (leave empty if not needed)'
+        });
+        if (p.isCancel(buildInput)) {
+            p.cancel((0, i18n_1.t)('addLangCancelled', lang));
+            process.exit(0);
+        }
+        const runInput = await p.text({
+            message: (0, i18n_1.t)('addLangEnterRunCmd', lang),
+            placeholder: `e.g. python3 main.py or ./a.out`,
+            validate: (val) => (!val.trim() ? (0, i18n_1.t)('addLangRunCmdNotEmpty', lang) : undefined)
+        });
+        if (p.isCancel(runInput)) {
+            p.cancel((0, i18n_1.t)('addLangCancelled', lang));
+            process.exit(0);
+        }
+        extension = extInput.trim();
+        build = buildInput.trim();
+        run = runInput.trim();
+        template = `// Solve the problem here\n`;
+    }
+    const s = p.spinner();
+    s.start((0, i18n_1.t)('addLangSpinner', lang));
+    try {
+        (0, initializer_1.addLanguage)(root, targetLang, {
+            extension,
+            build,
+            run,
+            template
+        });
+    }
+    catch (e) {
+        s.stop('Failed');
+        throw e;
+    }
+    s.stop((0, i18n_1.t)('addLangSuccess', lang, targetLang));
+}));
 program.parse(process.argv);

package/dist/config/config-store.d.ts

@@ -10,6 +10,8 @@ export interface Config {
     testDirName: string;
     contestDir?: string;
     lang?: 'en' | 'ja';
+    extractProblemStatement?: boolean;
+    problemLang?: 'en' | 'ja';
 }
 export declare const DEFAULT_CONFIG: Config;
 export declare function getConfigPath(workspaceRoot: string): string;

package/dist/config/config-store.js

@@ -56,7 +56,10 @@ exports.DEFAULT_CONFIG = {
         }
     },
     testDirName: 'tests',
-    contestDir: ''
+    contestDir: '',
+    lang: 'en',
+    extractProblemStatement: false,
+    problemLang: 'ja'
 };
 function getConfigPath(workspaceRoot) {
     return path.join(workspaceRoot, '.atcoder-cli', 'config.json');
@@ -72,10 +75,7 @@ function loadConfig(workspaceRoot) {
         return {
             ...exports.DEFAULT_CONFIG,
             ...parsed,
-            languages: {
-                ...exports.DEFAULT_CONFIG.languages,
-                ...(parsed.languages || {})
-            }
+            languages: parsed.languages ? parsed.languages : exports.DEFAULT_CONFIG.languages
         };
     }
     catch (e) {

package/dist/utils/i18n.d.ts

@@ -46,6 +46,10 @@ export declare const MESSAGES: {
         en: string;
         ja: string;
     };
+    descAddLang: {
+        en: string;
+        ja: string;
+    };
     initIntro: {
         en: string;
         ja: string;
@@ -186,6 +190,14 @@ export declare const MESSAGES: {
         en: (count: number) => string;
         ja: (count: number) => string;
     };
+    newStatementWarningTitle: {
+        en: string;
+        ja: string;
+    };
+    newStatementWarningBody: {
+        en: string;
+        ja: string;
+    };
     testIntro: {
         en: (contestId: string, label: string) => string;
         ja: (contestId: string, label: string) => string;
@@ -330,6 +342,14 @@ export declare const MESSAGES: {
         en: string;
         ja: string;
     };
+    langSelectMessage: {
+        en: string;
+        ja: string;
+    };
+    langCancelled: {
+        en: string;
+        ja: string;
+    };
     submitSessionExpired: {
         en: string;
         ja: string;
@@ -338,6 +358,50 @@ export declare const MESSAGES: {
         en: string;
         ja: string;
     };
+    addLangAlreadyExists: {
+        en: (lang: string) => string;
+        ja: (lang: string) => string;
+    };
+    addLangEnterName: {
+        en: string;
+        ja: string;
+    };
+    addLangNameNotEmpty: {
+        en: string;
+        ja: string;
+    };
+    addLangCancelled: {
+        en: string;
+        ja: string;
+    };
+    addLangEnterExtension: {
+        en: (lang: string) => string;
+        ja: (lang: string) => string;
+    };
+    addLangExtNotEmpty: {
+        en: string;
+        ja: string;
+    };
+    addLangEnterBuildCmd: {
+        en: string;
+        ja: string;
+    };
+    addLangEnterRunCmd: {
+        en: string;
+        ja: string;
+    };
+    addLangRunCmdNotEmpty: {
+        en: string;
+        ja: string;
+    };
+    addLangSpinner: {
+        en: string;
+        ja: string;
+    };
+    addLangSuccess: {
+        en: (lang: string) => string;
+        ja: (lang: string) => string;
+    };
 };
 /**
  * Translates a key into the active language.

package/dist/utils/i18n.js

@@ -87,13 +87,17 @@ exports.MESSAGES = {
         ja: 'ダウンロードしたサンプルケースに対してローカルテストを実行します'
     },
     descSubmit: {
-        en: 'Submit code to AtCoder and poll status',
-        ja: 'コードを AtCoder に提出し、ジャッジステータスを監視します'
+        en: 'Submit code to AtCoder',
+        ja: 'コードを AtCoder に提出します'
     },
     descLang: {
         en: 'Change the display language (en or ja)',
         ja: '表示言語の切り替え (en または ja)'
     },
+    descAddLang: {
+        en: 'Add a programming language configuration and template',
+        ja: 'プログラミング言語の設定とテンプレートを追加します'
+    },
     // init
     initIntro: {
         en: 'AtCoder Workspace - Workspace Initialization',
@@ -241,6 +245,14 @@ exports.MESSAGES = {
         en: (count) => `Scaffolding complete for ${count} task(s).`,
         ja: (count) => `${count} 個の問題のセットアップが完了しました。`
     },
+    newStatementWarningTitle: {
+        en: '[WARNING] Automatic problem statement extraction is enabled',
+        ja: '【警告】問題文の自動抽出が有効化されています'
+    },
+    newStatementWarningBody: {
+        en: '• DO NOT feed the problem statement Markdown to Generative AI during a rated contest (violates rules).\n• DO NOT publish or share the extracted problem statement on the internet (e.g. public GitHub repos).',
+        ja: '・コンテスト中に問題文のMarkdownを生成AIに読み込ませないでください（ルール違反となります）。\n・抽出した問題文をそのままインターネット（GitHubパブリックリポジトリ等）に公開・共有しないでください。'
+    },
     // test
     testIntro: {
         en: (contestId, label) => `Running tests for ${contestId}/${label}`,
@@ -284,7 +296,7 @@ exports.MESSAGES = {
     },
     testOutroFailed: {
         en: 'Some tests failed. 😢',
-        ja: '一部のテストが不合格でした。 😢'
+        ja: 'テストに失敗しました。 😢'
     },
     // submit
     submitPreparing: {
@@ -388,6 +400,14 @@ exports.MESSAGES = {
         en: 'Usage: atc lang <en|ja>',
         ja: '使い方: atc lang <en|ja>'
     },
+    langSelectMessage: {
+        en: 'Select display language:',
+        ja: '表示言語を選択してください:'
+    },
+    langCancelled: {
+        en: 'Language selection cancelled.',
+        ja: '言語選択がキャンセルされました。'
+    },
     submitSessionExpired: {
         en: 'Session expired or invalid. Please log in again using "atc login".',
         ja: 'セッションの期限が切れているか無効です。"atc login" を実行して再ログインしてください。'
@@ -395,6 +415,50 @@ exports.MESSAGES = {
     submitLangSelectNotFound: {
         en: 'Language selection element not found on submit page. Please make sure you are logged in and the contest has started.',
         ja: '提出ページに言語選択要素が見つかりませんでした。ログイン状態であること、およびコンテストが開始されていることを確認してください。'
+    },
+    addLangAlreadyExists: {
+        en: (lang) => `Language "${lang}" is already configured.`,
+        ja: (lang) => `言語 "${lang}" は既に設定されています。`
+    },
+    addLangEnterName: {
+        en: 'Enter the programming language name to add:',
+        ja: '追加するプログラミング言語名を入力してください:'
+    },
+    addLangNameNotEmpty: {
+        en: 'Language name cannot be empty.',
+        ja: '言語名は空にすることはできません。'
+    },
+    addLangCancelled: {
+        en: 'Language addition cancelled.',
+        ja: '言語の追加がキャンセルされました。'
+    },
+    addLangEnterExtension: {
+        en: (lang) => `Enter file extension for ${lang}:`,
+        ja: (lang) => `${lang} のファイル拡張子を入力してください:`
+    },
+    addLangExtNotEmpty: {
+        en: 'Extension cannot be empty.',
+        ja: '拡張子は空にすることはできません。'
+    },
+    addLangEnterBuildCmd: {
+        en: 'Enter build command (leave empty if not needed):',
+        ja: 'ビルドコマンドを入力してください (不要な場合は空欄のまま):'
+    },
+    addLangEnterRunCmd: {
+        en: 'Enter execution command:',
+        ja: '実行コマンドを入力してください:'
+    },
+    addLangRunCmdNotEmpty: {
+        en: 'Execution command cannot be empty.',
+        ja: '実行コマンドは空にすることはできません。'
+    },
+    addLangSpinner: {
+        en: 'Adding language configuration...',
+        ja: '言語設定を追加中...'
+    },
+    addLangSuccess: {
+        en: (lang) => `Language "${lang}" added successfully!`,
+        ja: (lang) => `言語 "${lang}" が正常に追加されました！`
     }
 };
 /**

package/dist/workspace/initializer.d.ts

@@ -1,4 +1,18 @@
+import { LanguageConfig } from '../config/config-store';
+export declare const DEFAULT_CPP_TEMPLATE = "#include <bits/stdc++.h>\n\nusing namespace std;\n\nint main() {\n    // Solve the problem here\n    return 0;\n}\n";
+export declare const DEFAULT_PYTHON_TEMPLATE = "import sys\n\ndef main():\n    # Solve the problem here\n    pass\n\nif __name__ == '__main__':\n    main()\n";
+export declare const LANGUAGE_PRESETS: Record<string, {
+    config: LanguageConfig;
+    template: string;
+    filename: string;
+}>;
 export declare function initWorkspace(targetDir?: string, defaultLanguage?: string): {
     alreadyInitialized: boolean;
     gitignoreUpdated: boolean;
 };
+export declare function addLanguage(workspaceRoot: string, langName: string, options: {
+    extension: string;
+    build: string;
+    run: string;
+    template?: string;
+}): void;