openshain 0.1.0

package/LICENSE

@@ -0,0 +1,202 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

package/README.md

@@ -0,0 +1,7 @@
+# openshain
+
+The `openshain` command: the reference CLI of the openshain agent harness.
+
+Part of [openshain](https://github.com/openshain/openshain). Requires Bun 1.3 or later: the package ships TypeScript source. Documentation, in Japanese, lives in the repository.
+
+License: Apache-2.0

package/package.json

@@ -0,0 +1,52 @@
+{
+  "name": "openshain",
+  "version": "0.1.0",
+  "description": "Reference CLI of the openshain agent harness",
+  "keywords": [
+    "openshain",
+    "agent",
+    "runtime",
+    "mcp",
+    "accounting",
+    "japan"
+  ],
+  "author": "Hiroki Nakatani",
+  "license": "Apache-2.0",
+  "homepage": "https://github.com/openshain/openshain",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/openshain/openshain.git",
+    "directory": "packages/cli"
+  },
+  "bugs": "https://github.com/openshain/openshain/issues",
+  "type": "module",
+  "engines": {
+    "bun": ">=1.3"
+  },
+  "files": [
+    "src",
+    "!src/**/*.test.ts",
+    "!src/**/*.test.tsx",
+    "README.md",
+    "LICENSE"
+  ],
+  "exports": {
+    ".": "./src/index.ts"
+  },
+  "bin": {
+    "openshain": "./src/bin.ts"
+  },
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "1.30.0",
+    "@openshain/agent": "0.1.0",
+    "@openshain/core": "0.1.0",
+    "@openshain/mcp": "0.1.0",
+    "@openshain/tools": "0.1.0",
+    "ink": "7.1.1",
+    "react": "19.2.8"
+  },
+  "devDependencies": {
+    "@types/react": "19.2.14",
+    "ink-testing-library": "4.0.0"
+  }
+}

package/src/bin.ts

@@ -0,0 +1,147 @@
+#!/usr/bin/env bun
+import { createInterface } from "node:readline/promises";
+import { parseArgs } from "node:util";
+import { anthropicProvider, openaiCompatibleProvider } from "@openshain/agent";
+import { isOpenshainError, type RuntimeProviders } from "@openshain/core";
+import { standardTools } from "@openshain/tools";
+import { init } from "./commands/init.ts";
+import { mcp } from "./commands/mcp.ts";
+import { run } from "./commands/run.ts";
+import { toolsList } from "./commands/tools.ts";
+import { workList, workResume, workShow } from "./commands/work.ts";
+import { plain } from "./format.ts";
+import { errorLabel } from "./labels.ts";
+import { startTui } from "./tui/index.ts";
+import { findWorkspace } from "./workspace.ts";
+
+const USAGE = `使い方:
+  openshain                      端末で対話を始める
+  openshain init                 openshain.yaml のひな型を書く
+  openshain run "<依頼>"          依頼を Work として進める
+  openshain tools list           使える Tool の一覧
+  openshain work list            Work の一覧
+  openshain work show <id>       Work の詳細
+  openshain work resume <id>     途中で止まった Work を続ける
+  openshain mcp                  MCP Server を stdio で起動する
+
+  --workspace <dir>              起点のディレクトリ。省略時はカレントディレクトリ
+                                 init はそこに書き、他のコマンドはそこから上に openshain.yaml を探す`;
+
+/** The providers this CLI knows, by the ids used in openshain.yaml. */
+const providers: RuntimeProviders = {
+  models: {
+    anthropic: (model) => anthropicProvider(model),
+    "openai-compatible": (model) => openaiCompatibleProvider(model),
+  },
+  tools: { standard: () => standardTools() },
+};
+
+async function main(argv: string[]): Promise<number> {
+  const write = (line: string) => console.log(plain(line));
+  let values: { workspace?: string; help?: boolean };
+  let positionals: string[];
+  try {
+    ({ values, positionals } = parseArgs({
+      args: argv,
+      options: { workspace: { type: "string" }, help: { type: "boolean", short: "h" } },
+      allowPositionals: true,
+    }));
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    const option = /'(-[^']*)'/.exec(message)?.[1];
+    const unknown = (err as { code?: string }).code === "ERR_PARSE_ARGS_UNKNOWN_OPTION" && option;
+    write(unknown ? `不明なオプション ${option}` : `引数を解釈できません。${message}`);
+    write(USAGE);
+    return 2;
+  }
+  const [command, ...rest] = positionals;
+  if (!command && !values.help && process.stdin.isTTY === true && process.stdout.isTTY === true) {
+    const workspaceRoot = await findWorkspace(values.workspace ?? process.cwd());
+    return startTui({ workspaceRoot, providers });
+  }
+  if (values.help || !command) {
+    write(USAGE);
+    return values.help ? 0 : 2;
+  }
+  switch (command) {
+    case "init":
+      await init({ workspaceRoot: values.workspace ?? process.cwd(), write });
+      return 0;
+    case "run": {
+      const objective = rest.join(" ").trim();
+      if (!objective) {
+        write('依頼の文を指定してください。openshain run "今月の経理を進めて" のように。');
+        return 2;
+      }
+      const workspaceRoot = await findWorkspace(values.workspace ?? process.cwd());
+      return withTerminal((ask) =>
+        run({ workspaceRoot, providers, objective, write, ...(ask && { ask }) }),
+      );
+    }
+    case "mcp": {
+      const workspaceRoot = await findWorkspace(values.workspace ?? process.cwd());
+      await mcp({ workspaceRoot, providers });
+      return 0;
+    }
+    case "tools": {
+      if (rest[0] !== "list") {
+        write(USAGE);
+        return 2;
+      }
+      const workspaceRoot = await findWorkspace(values.workspace ?? process.cwd());
+      await toolsList({ workspaceRoot, providers, write });
+      return 0;
+    }
+    case "work": {
+      const sub = rest[0];
+      const id = rest[1] ?? "";
+      if (!(sub === "list" || ((sub === "show" || sub === "resume") && id))) {
+        write(USAGE);
+        return 2;
+      }
+      const workspaceRoot = await findWorkspace(values.workspace ?? process.cwd());
+      if (sub === "list") {
+        await workList({ workspaceRoot, write });
+        return 0;
+      }
+      if (sub === "show") {
+        await workShow({ workspaceRoot, id, write });
+        return 0;
+      }
+      return withTerminal((ask) =>
+        workResume({ workspaceRoot, providers, id, write, ...(ask && { ask }) }),
+      );
+    }
+    default:
+      write(`不明なコマンド ${command}`);
+      write(USAGE);
+      return 2;
+  }
+}
+
+/** Runs `fn` with a way to ask the person when a terminal is there to answer; otherwise without one. */
+async function withTerminal(
+  fn: (ask?: (question: string) => Promise<string>) => Promise<number>,
+): Promise<number> {
+  // Without a terminal there is no one to answer; the work waits instead.
+  if (process.stdin.isTTY !== true || process.stdout.isTTY !== true) return fn();
+  const rl = createInterface({ input: process.stdin, output: process.stdout });
+  try {
+    return await fn((question) => rl.question(`${plain(question)}\n> `));
+  } finally {
+    rl.close();
+  }
+}
+
+main(process.argv.slice(2)).then(
+  (code) => process.exit(code),
+  (err: unknown) => {
+    if (isOpenshainError(err)) {
+      const heading = errorLabel(err.code);
+      console.error(plain(`エラー(${err.code}) ${heading ? `${heading}。` : ""}${err.message}`));
+    } else {
+      console.error(err);
+    }
+    process.exit(1);
+  },
+);

package/src/commands/init.ts

@@ -0,0 +1,144 @@
+import { readFile, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+import { CONFIG_FILE_NAME, type Language, OpenshainError } from "@openshain/core";
+
+/** The company's language for the template: from the OS locale, Japanese unless the locale says otherwise. */
+export function detectLanguage(env: Record<string, string | undefined>): Language {
+  const raw = env.LC_ALL || env.LC_MESSAGES || env.LANG || "";
+  const code = raw.toLowerCase().split(/[_.@-]/)[0] ?? "";
+  if (code === "ja" || code === "" || code === "c" || code === "posix") return "ja";
+  return "en";
+}
+
+export const configTemplate = (language: Language) => `version: 1
+company:
+  name: サンプル株式会社   # 会社名。model に伝わる
+  language: ${language}             # ja | en。社員エージェントの名前の言語。init が OS の locale から埋める
+principal:
+  id: alice                # 依頼する人の id。小文字の英数字、_ と -
+  name: Alice
+profession:
+  id: generic
+  # model への指示。100,000 文字まで
+  instructions: |
+    あなたはこの会社の事務担当です。依頼された作業を、workspace 内のファイルだけを使って進めてください。
+model:
+  provider: anthropic      # anthropic | openai-compatible
+  model: claude-opus-5
+  api_key_env: ANTHROPIC_API_KEY   # API キーを入れておく環境変数の名前。サーバーを替えるなら変数名も見直す
+  # base_url: http://localhost:11434/v1   # openai-compatible のとき
+  # options: { effort: high }             # provider にそのまま渡す
+tools:
+  - provider: standard
+    # allow: [fs_list, fs_search, fs_read, csv_read, csv_aggregate, markdown_read, fs_write, csv_write]   # 省略時は全部
+  # - module: ./tools/my-tool.ts   # ToolProvider を default export するモジュール
+limits:
+  max_model_calls: 30      # 超えると Work は失敗(上限到達)で止まる
+  max_tool_calls: 100
+  max_output_tokens: 16000 # model の 1 回の出力の上限
+# debug:
+#   persist_raw: true      # provider の生の応答を記録に残す
+`;
+
+export const CONFIG_TEMPLATE = configTemplate("ja");
+
+/** Registers the runtime as a project MCP server for Claude Code. `openshain` must be on PATH. */
+export const MCP_TEMPLATE = `${JSON.stringify(
+  { mcpServers: { openshain: { command: "openshain", args: ["mcp"] } } },
+  null,
+  2,
+)}\n`;
+
+/** What an outside agent reads before working in the folder. Codex reads AGENTS.md; Claude Code reads it through CLAUDE.md. */
+export const AGENTS_TEMPLATE = `# この会社フォルダで働くエージェントへ
+
+このフォルダは openshain の Company Workspace です。この指示は、Claude Code や Codex のような外部のエージェントが MCP 経由でこのフォルダを扱うときのものです。\`openshain run\` で Runtime 自身が動くときは、Work の作成と完了を Runtime が行うので、下の work_* の手順は当てはまりません。
+
+会社のファイルの読み書きと集計は openshain の MCP tool で行います。Claude Code や Codex 自身の Read、Write、Bash は会社のファイルには使いません。Runtime を通らなかった操作は記録に残らないためです。
+
+- 依頼を受けたら、まず \`work_create\` に依頼の文をそのまま渡して Work を作る
+- ファイルは \`fs_list\`、\`fs_search\`、\`fs_read\`、\`csv_read\`、\`markdown_read\` で見る。合計や件数は \`csv_aggregate\` に任せ、自分で足さない
+- 書くときは \`fs_write\` か \`csv_write\`
+- 終わったら \`work_complete\` に、何をしたかと、書いたファイルを渡す。続けられないときは \`work_fail\`
+- \`openshain.yaml\` と \`work/\` は Runtime のもの。触らない
+`;
+
+export const CLAUDE_TEMPLATE = "@AGENTS.md\n";
+
+export interface InitOptions {
+  workspaceRoot: string;
+  write: (line: string) => void;
+}
+
+/**
+ * Writes the starter files of a company workspace: openshain.yaml, .mcp.json, AGENTS.md and
+ * CLAUDE.md. A workspace that already has openshain.yaml is left alone with an error. An existing
+ * .mcp.json keeps its servers and gains the openshain entry when it lacks one; any other file that
+ * already exists is kept as it is.
+ */
+export async function init({ workspaceRoot, write }: InitOptions): Promise<void> {
+  const configPath = join(workspaceRoot, CONFIG_FILE_NAME);
+  try {
+    await writeFile(configPath, configTemplate(detectLanguage(process.env)), { flag: "wx" });
+  } catch (err) {
+    const code = (err as NodeJS.ErrnoException).code;
+    if (code === "EEXIST") {
+      throw new OpenshainError("config", `${configPath} はすでにあります。上書きはしません。`);
+    }
+    if (code === "ENOENT") {
+      throw new OpenshainError(
+        "config",
+        `${workspaceRoot} がありません。先にディレクトリを作ってください。`,
+      );
+    }
+    throw err;
+  }
+  write(`${configPath} を作りました。`);
+  for (const [name, content] of [
+    [".mcp.json", MCP_TEMPLATE],
+    ["AGENTS.md", AGENTS_TEMPLATE],
+    ["CLAUDE.md", CLAUDE_TEMPLATE],
+  ] as const) {
+    const path = join(workspaceRoot, name);
+    try {
+      await writeFile(path, content, { flag: "wx" });
+      write(`${path} を作りました。`);
+    } catch (err) {
+      if ((err as NodeJS.ErrnoException).code !== "EEXIST") throw err;
+      if (name === ".mcp.json") write(await addToMcpConfig(path));
+      else write(`${path} はすでにあるので触りません。`);
+    }
+  }
+  write(
+    "company と principal を自分の会社に合わせ、api_key_env に書いた環境変数を設定してから openshain run を実行してください。",
+  );
+}
+
+/**
+ * Adds the openshain server to a .mcp.json that is already there, keeping every other server.
+ * A file that cannot be read as JSON is left as it is, and the line says so.
+ */
+async function addToMcpConfig(path: string): Promise<string> {
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(await readFile(path, "utf8"));
+  } catch {
+    return `${path} はすでにあり、JSON として読めないので触りません。openshain を手で登録してください。`;
+  }
+  if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
+    return `${path} はすでにあり、形が違うので触りません。openshain を手で登録してください。`;
+  }
+  const config = parsed as { mcpServers?: unknown };
+  const servers =
+    config.mcpServers && typeof config.mcpServers === "object" && !Array.isArray(config.mcpServers)
+      ? (config.mcpServers as Record<string, unknown>)
+      : {};
+  if (Object.hasOwn(servers, "openshain"))
+    return `${path} には openshain がすでにあるので触りません。`;
+  const next = {
+    ...config,
+    mcpServers: { ...servers, openshain: { command: "openshain", args: ["mcp"] } },
+  };
+  await writeFile(path, `${JSON.stringify(next, null, 2)}\n`, "utf8");
+  return `${path} に openshain を足しました。他の項目はそのままです。`;
+}

package/src/commands/mcp.ts

@@ -0,0 +1,24 @@
+import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import type { RuntimeProviders } from "@openshain/core";
+import { createMcpServer } from "@openshain/mcp";
+
+export interface McpOptions {
+  workspaceRoot: string;
+  providers: RuntimeProviders;
+}
+
+/**
+ * Serves the workspace over MCP on stdin and stdout until the client hangs up. Nothing else may
+ * be written to stdout while it runs; the protocol owns it.
+ */
+export async function mcp({ workspaceRoot, providers }: McpOptions): Promise<void> {
+  const server = await createMcpServer({ workspaceRoot, tools: providers.tools });
+  const transport = new StdioServerTransport();
+  await new Promise<void>((resolve) => {
+    server.onclose = () => resolve();
+    server.connect(transport).catch((err: unknown) => {
+      console.error(err instanceof Error ? err.message : String(err));
+      resolve();
+    });
+  });
+}