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

package/src/config/config-store.ts

@@ -15,6 +15,8 @@ export interface Config {
   testDirName: string;
   contestDir?: string;
   lang?: 'en' | 'ja';
+  extractProblemStatement?: boolean;
+  problemLang?: 'en' | 'ja';
 }
 
 export const DEFAULT_CONFIG: Config = {
@@ -34,7 +36,10 @@ export const DEFAULT_CONFIG: Config = {
     }
   },
   testDirName: 'tests',
-  contestDir: ''
+  contestDir: '',
+  lang: 'en',
+  extractProblemStatement: false,
+  problemLang: 'ja'
 };
 
 export function getConfigPath(workspaceRoot: string): string {
@@ -52,10 +57,7 @@ export function loadConfig(workspaceRoot: string): Config {
     return {
       ...DEFAULT_CONFIG,
       ...parsed,
-      languages: {
-        ...DEFAULT_CONFIG.languages,
-        ...(parsed.languages || {})
-      }
+      languages: parsed.languages ? parsed.languages : DEFAULT_CONFIG.languages
     };
   } catch (e) {
     return DEFAULT_CONFIG;

package/src/test-runner/runner.test.ts

@@ -54,6 +54,7 @@ describe('runner utils', () => {
 
   describe('resolveTaskDirectory', () => {
     it('should resolve task directory under configured contestDir', () => {
+      const cwdSpy = vi.spyOn(process, 'cwd').mockReturnValue('/workspace');
       const loadConfigSpy = vi.spyOn(configStore, 'loadConfig').mockReturnValue({
         defaultLanguage: 'cpp',
         languages: {},
@@ -64,6 +65,7 @@ describe('runner utils', () => {
       const resolved = resolveTaskDirectory('/workspace', 'abc300/a');
       expect(resolved).toContain('my-contests/abc300/a');
 
+      cwdSpy.mockRestore();
       loadConfigSpy.mockRestore();
     });
   });

package/src/utils/i18n.ts

@@ -85,13 +85,17 @@ export const 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: {
@@ -244,6 +248,14 @@ export const MESSAGES = {
     en: (count: number) => `Scaffolding complete for ${count} task(s).`,
     ja: (count: number) => `${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: {
@@ -288,7 +300,7 @@ export const MESSAGES = {
   },
   testOutroFailed: {
     en: 'Some tests failed. 😢',
-    ja: '一部のテストが不合格でした。 😢'
+    ja: 'テストに失敗しました。 😢'
   },
 
   // submit
@@ -394,6 +406,14 @@ export const 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" を実行して再ログインしてください。'
@@ -401,6 +421,50 @@ export const 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: string) => `Language "${lang}" is already configured.`,
+    ja: (lang: string) => `言語 "${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: string) => `Enter file extension for ${lang}:`,
+    ja: (lang: string) => `${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: string) => `Language "${lang}" added successfully!`,
+    ja: (lang: string) => `言語 "${lang}" が正常に追加されました！`
   }
 };
 

package/src/workspace/initializer.test.ts

@@ -0,0 +1,125 @@
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import * as fs from 'fs';
+import * as path from 'path';
+import { initWorkspace, addLanguage } from './initializer';
+import { loadConfig } from '../config/config-store';
+
+describe('initializer', () => {
+  const tempDir = path.join(__dirname, '../../test-temp-init');
+
+  beforeEach(() => {
+    if (fs.existsSync(tempDir)) {
+      fs.rmSync(tempDir, { recursive: true, force: true });
+    }
+    fs.mkdirSync(tempDir, { recursive: true });
+  });
+
+  afterEach(() => {
+    if (fs.existsSync(tempDir)) {
+      fs.rmSync(tempDir, { recursive: true, force: true });
+    }
+  });
+
+  it('should initialize workspace with cpp only if cpp is selected', () => {
+    const { alreadyInitialized, gitignoreUpdated } = initWorkspace(tempDir, 'cpp');
+
+    expect(alreadyInitialized).toBe(false);
+    expect(gitignoreUpdated).toBe(true);
+
+    const atCoderCliDir = path.join(tempDir, '.atcoder-cli');
+    expect(fs.existsSync(atCoderCliDir)).toBe(true);
+
+    // Verify config.json contains only cpp
+    const config = loadConfig(tempDir);
+    expect(config.defaultLanguage).toBe('cpp');
+    expect(config.languages).toHaveProperty('cpp');
+    expect(config.languages).not.toHaveProperty('python');
+
+    // Verify templates contains only cpp
+    const templatesDir = path.join(atCoderCliDir, 'templates');
+    expect(fs.existsSync(path.join(templatesDir, 'cpp'))).toBe(true);
+    expect(fs.existsSync(path.join(templatesDir, 'cpp', 'main.cpp'))).toBe(true);
+    expect(fs.existsSync(path.join(templatesDir, 'python'))).toBe(false);
+
+    // Verify .gitignore contains problem.md
+    const gitignorePath = path.join(tempDir, '.gitignore');
+    expect(fs.existsSync(gitignorePath)).toBe(true);
+    const gitignoreContent = fs.readFileSync(gitignorePath, 'utf8');
+    expect(gitignoreContent).toContain('problem.md');
+  });
+
+  it('should initialize workspace with python only if python is selected', () => {
+    const { alreadyInitialized, gitignoreUpdated } = initWorkspace(tempDir, 'python');
+
+    expect(alreadyInitialized).toBe(false);
+    expect(gitignoreUpdated).toBe(true);
+
+    const atCoderCliDir = path.join(tempDir, '.atcoder-cli');
+    expect(fs.existsSync(atCoderCliDir)).toBe(true);
+
+    // Verify config.json contains only python
+    const config = loadConfig(tempDir);
+    expect(config.defaultLanguage).toBe('python');
+    expect(config.languages).toHaveProperty('python');
+    expect(config.languages).not.toHaveProperty('cpp');
+
+    // Verify templates contains only python
+    const templatesDir = path.join(atCoderCliDir, 'templates');
+    expect(fs.existsSync(path.join(templatesDir, 'python'))).toBe(true);
+    expect(fs.existsSync(path.join(templatesDir, 'python', 'main.py'))).toBe(true);
+    expect(fs.existsSync(path.join(templatesDir, 'cpp'))).toBe(false);
+  });
+
+  describe('addLanguage', () => {
+    it('should throw an error if the language is already configured', () => {
+      initWorkspace(tempDir, 'cpp');
+
+      expect(() => {
+        addLanguage(tempDir, 'cpp', {
+          extension: 'cpp',
+          build: '',
+          run: ''
+        });
+      }).toThrowError('Language "cpp" is already configured.');
+    });
+
+    it('should add a new non-preset language', () => {
+      initWorkspace(tempDir, 'cpp');
+
+      addLanguage(tempDir, 'rust', {
+        extension: 'rs',
+        build: 'rustc main.rs',
+        run: './main',
+        template: '// Rust main\n'
+      });
+
+      const config = loadConfig(tempDir);
+      expect(config.languages).toHaveProperty('rust');
+      expect(config.languages.rust.extension).toBe('rs');
+      expect(config.languages.rust.build).toBe('rustc main.rs');
+      expect(config.languages.rust.run).toBe('./main');
+
+      const templatePath = path.join(tempDir, '.atcoder-cli', 'templates', 'rust', 'main.rs');
+      expect(fs.existsSync(templatePath)).toBe(true);
+      expect(fs.readFileSync(templatePath, 'utf8')).toBe('// Rust main\n');
+    });
+
+    it('should add a preset language (like python) when cpp is already initialized', () => {
+      initWorkspace(tempDir, 'cpp');
+
+      addLanguage(tempDir, 'python', {
+        extension: '',
+        build: '',
+        run: ''
+      });
+
+      const config = loadConfig(tempDir);
+      expect(config.languages).toHaveProperty('python');
+      expect(config.languages.python.extension).toBe('py');
+      expect(config.languages.python.run).toBe('python3 main.py');
+
+      const templatePath = path.join(tempDir, '.atcoder-cli', 'templates', 'python', 'main.py');
+      expect(fs.existsSync(templatePath)).toBe(true);
+    });
+  });
+});

package/src/workspace/initializer.ts

@@ -1,8 +1,9 @@
 import * as fs from 'fs';
 import * as path from 'path';
-import { DEFAULT_CONFIG, saveConfig } from '../config/config-store';
+import { saveConfig, Config, LanguageConfig, loadConfig } from '../config/config-store';
+import { AtcError } from '../utils/errors';
 
-const DEFAULT_CPP_TEMPLATE = `#include <bits/stdc++.h>
+export const DEFAULT_CPP_TEMPLATE = `#include <bits/stdc++.h>
 
 using namespace std;
 
@@ -12,7 +13,7 @@ int main() {
 }
 `;
 
-const DEFAULT_PYTHON_TEMPLATE = `import sys
+export const DEFAULT_PYTHON_TEMPLATE = `import sys
 
 def main():
     # Solve the problem here
@@ -22,6 +23,29 @@ if __name__ == '__main__':
     main()
 `;
 
+export const LANGUAGE_PRESETS: Record<string, { config: LanguageConfig; template: string; filename: string }> = {
+  cpp: {
+    config: {
+      extension: 'cpp',
+      templateDir: 'templates/cpp',
+      build: 'g++ -O2 -std=gnu++20 -o a.out main.cpp',
+      run: './a.out'
+    },
+    template: DEFAULT_CPP_TEMPLATE,
+    filename: 'main.cpp'
+  },
+  python: {
+    config: {
+      extension: 'py',
+      templateDir: 'templates/python',
+      build: '',
+      run: 'python3 main.py'
+    },
+    template: DEFAULT_PYTHON_TEMPLATE,
+    filename: 'main.py'
+  }
+};
+
 export function initWorkspace(
   targetDir: string = process.cwd(),
   defaultLanguage: string = 'cpp'
@@ -38,48 +62,125 @@ export function initWorkspace(
   // Create default config if it doesn't exist
   const configPath = path.join(atCoderCliDir, 'config.json');
   if (!fs.existsSync(configPath)) {
-    saveConfig(targetDir, {
-      ...DEFAULT_CONFIG,
-      defaultLanguage
-    });
+    const preset = LANGUAGE_PRESETS[defaultLanguage] || {
+      config: {
+        extension: defaultLanguage,
+        templateDir: `templates/${defaultLanguage}`,
+        build: '',
+        run: ''
+      },
+      template: '',
+      filename: `main.${defaultLanguage}`
+    };
+
+    const initialConfig: Config = {
+      defaultLanguage,
+      languages: {
+        [defaultLanguage]: preset.config
+      },
+      testDirName: 'tests',
+      contestDir: '',
+      lang: 'en',
+      extractProblemStatement: false,
+      problemLang: 'ja'
+    };
+    saveConfig(targetDir, initialConfig);
   }
 
   // Create default templates
   const templatesDir = path.join(atCoderCliDir, 'templates');
-  const cppTemplateDir = path.join(templatesDir, 'cpp');
-  const pythonTemplateDir = path.join(templatesDir, 'python');
-
-  if (!fs.existsSync(cppTemplateDir)) {
-    fs.mkdirSync(cppTemplateDir, { recursive: true });
-  }
-  const cppFile = path.join(cppTemplateDir, 'main.cpp');
-  if (!fs.existsSync(cppFile)) {
-    fs.writeFileSync(cppFile, DEFAULT_CPP_TEMPLATE, 'utf8');
-  }
+  const preset = LANGUAGE_PRESETS[defaultLanguage] || {
+    config: {
+      extension: defaultLanguage,
+      templateDir: `templates/${defaultLanguage}`,
+      build: '',
+      run: ''
+    },
+    template: '',
+    filename: `main.${defaultLanguage}`
+  };
 
-  if (!fs.existsSync(pythonTemplateDir)) {
-    fs.mkdirSync(pythonTemplateDir, { recursive: true });
+  const langTemplateDir = path.join(templatesDir, defaultLanguage);
+  if (!fs.existsSync(langTemplateDir)) {
+    fs.mkdirSync(langTemplateDir, { recursive: true });
   }
-  const pythonFile = path.join(pythonTemplateDir, 'main.py');
-  if (!fs.existsSync(pythonFile)) {
-    fs.writeFileSync(pythonFile, DEFAULT_PYTHON_TEMPLATE, 'utf8');
+  const templateFile = path.join(langTemplateDir, preset.filename);
+  if (!fs.existsSync(templateFile)) {
+    fs.writeFileSync(templateFile, preset.template, 'utf8');
   }
 
   // Update or create .gitignore
   const gitignorePath = path.join(targetDir, '.gitignore');
-  const ignoreRule = '\n# AtCoder CLI Session\n.atcoder-cli/session.json\n';
+  const ignoreSession = '.atcoder-cli/session.json';
+  const ignoreProblem = 'problem.md';
   let gitignoreUpdated = false;
 
   if (fs.existsSync(gitignorePath)) {
-    const content = fs.readFileSync(gitignorePath, 'utf8');
-    if (!content.includes('.atcoder-cli/session.json')) {
-      fs.writeFileSync(gitignorePath, content + ignoreRule, 'utf8');
+    let content = fs.readFileSync(gitignorePath, 'utf8');
+    let updated = false;
+    if (!content.includes(ignoreSession)) {
+      content += (content.endsWith('\n') ? '' : '\n') + '\n# AtCoder CLI Session\n' + ignoreSession + '\n';
+      updated = true;
+    }
+    if (!content.includes(ignoreProblem)) {
+      content += (content.endsWith('\n') ? '' : '\n') + '\n# AtCoder problem statements\n' + ignoreProblem + '\n';
+      updated = true;
+    }
+    if (updated) {
+      fs.writeFileSync(gitignorePath, content, 'utf8');
       gitignoreUpdated = true;
     }
   } else {
-    fs.writeFileSync(gitignorePath, ignoreRule.trim() + '\n', 'utf8');
+    const defaultIgnore = `# AtCoder CLI Session\n${ignoreSession}\n\n# AtCoder problem statements\n${ignoreProblem}\n`;
+    fs.writeFileSync(gitignorePath, defaultIgnore, 'utf8');
     gitignoreUpdated = true;
   }
 
   return { alreadyInitialized, gitignoreUpdated };
 }
+
+export function addLanguage(
+  workspaceRoot: string,
+  langName: string,
+  options: {
+    extension: string;
+    build: string;
+    run: string;
+    template?: string;
+  }
+): void {
+  const config = loadConfig(workspaceRoot);
+  const cleanLang = langName.trim().toLowerCase();
+
+  if (config.languages[cleanLang]) {
+    throw new AtcError(`Language "${cleanLang}" is already configured.`);
+  }
+
+  const preset = LANGUAGE_PRESETS[cleanLang];
+  const extension = options.extension || (preset ? preset.config.extension : cleanLang);
+  const build = options.build !== undefined ? options.build : (preset ? preset.config.build : '');
+  const run = options.run || (preset ? preset.config.run : '');
+  const template = options.template !== undefined ? options.template : (preset ? preset.template : '// Solve the problem here\n');
+
+  const templatesDir = path.join(workspaceRoot, '.atcoder-cli', 'templates');
+  const langTemplateDir = path.join(templatesDir, cleanLang);
+  if (!fs.existsSync(langTemplateDir)) {
+    fs.mkdirSync(langTemplateDir, { recursive: true });
+  }
+
+  const filename = preset ? preset.filename : `main.${extension}`;
+  const templateFile = path.join(langTemplateDir, filename);
+  if (!fs.existsSync(templateFile)) {
+    fs.writeFileSync(templateFile, template, 'utf8');
+  }
+
+  config.languages[cleanLang] = {
+    extension,
+    templateDir: `templates/${cleanLang}`,
+    build,
+    run
+  };
+
+  saveConfig(workspaceRoot, config);
+}
+

package/THIRD_PARTY_LICENSES

@@ -1,21 +0,0 @@
-# Third Party Acknowledgements
-
-AtCoder Workspace is a modern, single-directory all-in-one CLI for AtCoder. We would like to express our deepest gratitude to the creators and maintainers of the following projects, whose design and features inspired this CLI:
-
-## 1. atcoder-cli (acc)
-- **Author**: Tatamo
-- **Repository**: https://github.com/tatamo/atcoder-cli
-- **License**: MIT License
-- **Acknowledge**: We took inspiration from `atcoder-cli`'s template configurations, task structures, and workspace setups.
-
----
-
-## 2. online-judge-tools (oj)
-- **Organization**: online-judge-tools
-- **Repository**: https://github.com/online-judge-tools/oj
-- **License**: MIT License
-- **Acknowledge**: We took inspiration from `online-judge-tools`'s test execution runner, diff normalization algorithms, and command interface structure.
-
----
-
-Thank you for paving the way for the competitive programming tooling ecosystem!