@gird/ccli 2.18.0 → 2.20.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +53 -2
- package/dist/agent/model-catalog.js +100 -0
- package/dist/agent/model-catalog.js.map +1 -0
- package/dist/agent/os.js +358 -0
- package/dist/agent/os.js.map +1 -0
- package/dist/cli/args/index.js +58 -0
- package/dist/cli/args/index.js.map +1 -1
- package/dist/cli/repl/index.js +5 -3
- package/dist/cli/repl/index.js.map +1 -1
- package/dist/cli/run/index.js +24 -15
- package/dist/cli/run/index.js.map +1 -1
- package/dist/cli/run/task.js +20 -1
- package/dist/cli/run/task.js.map +1 -1
- package/dist/cli/session/checkpoint.js +51 -34
- package/dist/cli/session/checkpoint.js.map +1 -1
- package/dist/cli/slash/config/account.js +82 -0
- package/dist/cli/slash/config/account.js.map +1 -0
- package/dist/cli/slash/config/alias.js +96 -0
- package/dist/cli/slash/config/alias.js.map +1 -0
- package/dist/cli/slash/config/login.js +80 -0
- package/dist/cli/slash/config/login.js.map +1 -0
- package/dist/cli/slash/config/model.js +74 -9
- package/dist/cli/slash/config/model.js.map +1 -1
- package/dist/cli/slash/config/models.js +45 -0
- package/dist/cli/slash/config/models.js.map +1 -0
- package/dist/cli/slash/index.js +17 -1
- package/dist/cli/slash/index.js.map +1 -1
- package/dist/cli/slash/system/agent.js +1 -1
- package/dist/cli/slash/system/agent.js.map +1 -1
- package/dist/cli/slash/system/compact.js +1 -1
- package/dist/cli/slash/system/compact.js.map +1 -1
- package/dist/cli/slash/system/goal.js +1 -1
- package/dist/cli/slash/system/goal.js.map +1 -1
- package/dist/cli/slash/system/help.js +4 -0
- package/dist/cli/slash/system/help.js.map +1 -1
- package/dist/cli/slash/system/plan.js +1 -1
- package/dist/cli/slash/system/plan.js.map +1 -1
- package/dist/cli/slash/system/revert.js +7 -5
- package/dist/cli/slash/system/revert.js.map +1 -1
- package/dist/cli/stats/index.js +6 -1
- package/dist/cli/stats/index.js.map +1 -1
- package/dist/cli/stats/usage.js +215 -0
- package/dist/cli/stats/usage.js.map +1 -0
- package/dist/config/config.js +223 -1
- package/dist/config/config.js.map +1 -1
- package/dist/config/credentials.js +104 -0
- package/dist/config/credentials.js.map +1 -0
- package/dist/harness/index.js +9 -1
- package/dist/harness/index.js.map +1 -1
- package/dist/index.js +41 -2
- package/dist/index.js.map +1 -1
- package/dist/server/index.js +338 -0
- package/dist/server/index.js.map +1 -0
- package/dist/server/sessions.js +181 -0
- package/dist/server/sessions.js.map +1 -0
- package/dist/server/webui.html +1341 -0
- package/dist/server/webui.js +12 -0
- package/dist/server/webui.js.map +1 -0
- package/dist/tools/{skill-tool.js → agent/skill-tool.js} +1 -1
- package/dist/tools/agent/skill-tool.js.map +1 -0
- package/dist/tools/{todo.js → agent/todo.js} +1 -1
- package/dist/tools/agent/todo.js.map +1 -0
- package/dist/tools/agent/web-fetch.js.map +1 -0
- package/dist/tools/{edit-file.js → fs/edit-file.js} +8 -8
- package/dist/tools/fs/edit-file.js.map +1 -0
- package/dist/tools/{glob.js → fs/glob.js} +40 -6
- package/dist/tools/fs/glob.js.map +1 -0
- package/dist/tools/{grep.js → fs/grep.js} +49 -9
- package/dist/tools/fs/grep.js.map +1 -0
- package/dist/tools/{list-dir.js → fs/list-dir.js} +13 -2
- package/dist/tools/fs/list-dir.js.map +1 -0
- package/dist/tools/{read-file.js → fs/read-file.js} +5 -3
- package/dist/tools/fs/read-file.js.map +1 -0
- package/dist/tools/{write-file.js → fs/write-file.js} +8 -8
- package/dist/tools/fs/write-file.js.map +1 -0
- package/dist/tools/index.js +11 -11
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/shared.js.map +1 -1
- package/dist/tools/{bash-background.js → shell/bash-background.js} +5 -6
- package/dist/tools/shell/bash-background.js.map +1 -0
- package/dist/tools/shell/bash-output.js.map +1 -0
- package/dist/tools/{bash.js → shell/bash.js} +6 -7
- package/dist/tools/shell/bash.js.map +1 -0
- package/dist/tools/shell/kill-bash.js.map +1 -0
- package/package.json +2 -2
- package/dist/tools/bash-background.js.map +0 -1
- package/dist/tools/bash-output.js.map +0 -1
- package/dist/tools/bash.js.map +0 -1
- package/dist/tools/edit-file.js.map +0 -1
- package/dist/tools/glob.js.map +0 -1
- package/dist/tools/grep.js.map +0 -1
- package/dist/tools/kill-bash.js.map +0 -1
- package/dist/tools/list-dir.js.map +0 -1
- package/dist/tools/read-file.js.map +0 -1
- package/dist/tools/skill-tool.js.map +0 -1
- package/dist/tools/todo.js.map +0 -1
- package/dist/tools/web-fetch.js.map +0 -1
- package/dist/tools/write-file.js.map +0 -1
- /package/dist/tools/{web-fetch.js → agent/web-fetch.js} +0 -0
- /package/dist/tools/{bash-output.js → shell/bash-output.js} +0 -0
- /package/dist/tools/{kill-bash.js → shell/kill-bash.js} +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"goal.js","sourceRoot":"","sources":["../../../../src/cli/slash/system/goal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEvC,OAAO,EAAE,OAAO,EAAmB,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"goal.js","sourceRoot":"","sources":["../../../../src/cli/slash/system/goal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEvC,OAAO,EAAE,OAAO,EAAmB,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAQhE,gCAAgC;AAChC,MAAM,2BAA2B,GAAG;;;;;;wCAMI,CAAC;AAEzC,wCAAwC;AACxC,MAAM,UAAU,YAAY,CAAC,GAAW;IACpC,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC7B,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC;QACV,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9C,CAAC;IAED,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IACtC,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACvC,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,IAAI,EAAE,CAAC;AACxC,CAAC;AAED,+BAA+B;AAC/B,MAAM,UAAU,aAAa,CAAC,IAAY;IACtC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/B,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,IAAI,IAAI,GAAG,EAAE,CAAC;IAEd,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5B,IAAI,CAAC,IAAI,IAAI,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YACxC,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YAClD,SAAS;QACb,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;IAED,OAAO;QACH,IAAI,EAAE,IAAI,IAAI,oBAAoB;QAClC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE;KAC9C,CAAC;AACN,CAAC;AAED,yBAAyB;AACzB,SAAS,cAAc,CAAC,MAAc,EAAE,GAAG,GAAG,GAAG;IAC7C,IAAI,MAAM,CAAC,MAAM,IAAI,GAAG;QAAE,OAAO,MAAM,CAAC;IACxC,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,cAAc,CAAC;AACjD,CAAC;AAED,sBAAsB;AACtB,SAAS,cAAc,CAAC,EAAY;IAChC,MAAM,IAAI,GAAG,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;IAC9B,IAAI,IAAI,EAAE,OAAO,EAAE,CAAC;QAChB,IAAI,CAAC;YACD,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC;QAC1D,CAAC;QAAC,MAAM,CAAC;YACL,iBAAiB;QACrB,CAAC;IACL,CAAC;IACD,OAAO,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,SAAS,GAAG,CAAC;AACzC,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAY,EAAE,IAAY;IACpD,OAAO,GAAG,IAAI,YAAY,IAAI,EAAE,CAAC;AACrC,CAAC;AAED,2BAA2B;AAC3B,KAAK,UAAU,YAAY,CACvB,IAAY,EACZ,IAAY,EACZ,GAAiB;IAEjB,MAAM,MAAM,GAAG;;KAEd,IAAI;OACF,IAAI;;;;cAIG,CAAC;IAEX,MAAM,WAAW,GAAkB;QAC/B,GAAG,GAAG,CAAC,OAAO;QACd,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;KACpC,CAAC;IAEF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC;IACjD,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAC1B,WAAW,EACX,CAAC,KAAK,EAAE,EAAE;QACN,OAAO,IAAI,KAAK,CAAC;QACjB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC,EACD,EAAE,YAAY,EAAE,IAAI,EAAE,CACzB,CAAC;IACF,OAAO,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;IAE3C,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IACpD,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;AAC9D,CAAC;AAED,4BAA4B;AAC5B,MAAM,CAAC,KAAK,UAAU,UAAU,CAC5B,GAAW,EACX,GAAiB;IAEjB,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC,CAAC;QACrD,OAAO;IACX,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IACxB,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAEtB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,CAAC;IAC9C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,IAAI,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC;IAC5D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC;IAEjD,MAAM,OAAO,GAAG,IAAI;QAChB,CAAC,CAAC,MAAM,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,GAAG,CAAC;QACxD,CAAC,CAAC,MAAM,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,2BAA2B,CAAC,CAAC;IAC9D,IAAI,CAAC,OAAO,EAAE,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;QAC5C,OAAO;IACX,CAAC;IAED,IAAI,IAAI,GAAG,OAAO,CAAC;IACnB,IAAI,CAAC,IAAI,EAAE,CAAC;QACR,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;QACvB,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;IAC3B,CAAC;IAED,MAAM,WAAW,GAAG,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAErD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAC3C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAClB,2BAA2B;IAC3B,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,OAAO,CAC7B,WAAW,EACX,OAAO,EACP,IAAI,CACP,CAAC;IACF,IAAI,CAAC,OAAO,EAAE,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;QACzC,OAAO;IACX,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAE/C,8BAA8B;IAC9B,UAAU,EAAE,CAAC;IAEb,qCAAqC;IACrC,MAAM,cAAc,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAC9C,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,GAAG,uBAAuB,cAAc,IAAI,gBAAgB,IAAI,EAAE,CAAC;IAC5F,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;IAEzD,IAAI,CAAC;QACD,MAAM,YAAY,CAAC;YACf,EAAE,EAAE,GAAG,CAAC,EAAE;YACV,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,OAAO,EAAE,GAAG,CAAC,aAAa;YAC1B,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,SAAS,EAAE,EAAE;YACb,sBAAsB,EAAE,IAAI;YAC5B,sBAAsB,EAAE,IAAI;YAC5B,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,UAAU,EAAE,CAAC,EAAY,EAAE,EAAE;gBACzB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBAClD,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC;YACpC,CAAC;YACD,YAAY,EAAE,CAAC,EAAY,EAAE,MAAkB,EAAE,EAAE;gBAC/C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC;gBACpD,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;YAC/C,CAAC;SACJ,CAAC,CAAC;QAEH,MAAM,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IACxC,CAAC;YAAS,CAAC;QACP,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,cAAc,CAAC;IAC5C,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC;AAClD,CAAC"}
|
|
@@ -5,6 +5,10 @@ export const COMMANDS = [
|
|
|
5
5
|
['/undo [n]', '撤销最近 n 轮对话(默认 1)'],
|
|
6
6
|
['/compact', '把对话历史压缩成摘要,释放上下文'],
|
|
7
7
|
['/model [id]', '查看或切换模型'],
|
|
8
|
+
['/models [--refresh]', '列出当前 provider 的模型目录(走缓存)'],
|
|
9
|
+
['/account [--by-model]', '查看当前账号与配置来源(加 --by-model 按模型细分 usage)'],
|
|
10
|
+
['/login', '交互式录入 API key 并加密保存到本地凭证'],
|
|
11
|
+
['/alias [add|remove] [名] [模型]', '查看或管理模型别名'],
|
|
8
12
|
['/save [name]', '保存当前对话(省略名称自动生成)'],
|
|
9
13
|
['/load <name>', '加载会话;不完整时列出候选'],
|
|
10
14
|
['/sessions', '列出已保存的会话'],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../../../src/cli/slash/system/help.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,MAAM,CAAC,MAAM,QAAQ,GAA4B;IAC7C,CAAC,OAAO,EAAE,QAAQ,CAAC;IACnB,CAAC,QAAQ,EAAE,gBAAgB,CAAC;IAC5B,CAAC,WAAW,EAAE,kBAAkB,CAAC;IACjC,CAAC,UAAU,EAAE,kBAAkB,CAAC;IAChC,CAAC,aAAa,EAAE,SAAS,CAAC;IAC1B,CAAC,cAAc,EAAE,kBAAkB,CAAC;IACpC,CAAC,cAAc,EAAE,eAAe,CAAC;IACjC,CAAC,WAAW,EAAE,UAAU,CAAC;IACzB,CAAC,gBAAgB,EAAE,aAAa,CAAC;IACjC,CAAC,eAAe,EAAE,YAAY,CAAC;IAC/B,CAAC,cAAc,EAAE,sBAAsB,CAAC;IACxC,CAAC,uBAAuB,EAAE,gBAAgB,CAAC;IAC3C,CAAC,QAAQ,EAAE,iBAAiB,CAAC;IAC7B,CAAC,SAAS,EAAE,aAAa,CAAC;IAC1B,CAAC,qBAAqB,EAAE,sBAAsB,CAAC;IAC/C,CAAC,SAAS,EAAE,uCAAuC,CAAC;IACpD,CAAC,mBAAmB,EAAE,uCAAuC,CAAC;IAC9D,CAAC,cAAc,EAAE,cAAc,CAAC;IAChC,CAAC,WAAW,EAAE,aAAa,CAAC;IAC5B,CAAC,SAAS,EAAE,8BAA8B,CAAC;IAC3C,CAAC,iBAAiB,EAAE,eAAe,CAAC;IACpC,CAAC,gBAAgB,EAAE,qBAAqB,CAAC;IACzC,CAAC,cAAc,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,MAAM,UAAU,SAAS;IACrB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACrB,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,QAAQ,EAAE,CAAC;QACjC,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;IAC/C,CAAC;AACL,CAAC"}
|
|
1
|
+
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../../../src/cli/slash/system/help.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,MAAM,CAAC,MAAM,QAAQ,GAA4B;IAC7C,CAAC,OAAO,EAAE,QAAQ,CAAC;IACnB,CAAC,QAAQ,EAAE,gBAAgB,CAAC;IAC5B,CAAC,WAAW,EAAE,kBAAkB,CAAC;IACjC,CAAC,UAAU,EAAE,kBAAkB,CAAC;IAChC,CAAC,aAAa,EAAE,SAAS,CAAC;IAC1B,CAAC,qBAAqB,EAAE,0BAA0B,CAAC;IACnD,CAAC,uBAAuB,EAAE,uCAAuC,CAAC;IAClE,CAAC,QAAQ,EAAE,0BAA0B,CAAC;IACtC,CAAC,8BAA8B,EAAE,WAAW,CAAC;IAC7C,CAAC,cAAc,EAAE,kBAAkB,CAAC;IACpC,CAAC,cAAc,EAAE,eAAe,CAAC;IACjC,CAAC,WAAW,EAAE,UAAU,CAAC;IACzB,CAAC,gBAAgB,EAAE,aAAa,CAAC;IACjC,CAAC,eAAe,EAAE,YAAY,CAAC;IAC/B,CAAC,cAAc,EAAE,sBAAsB,CAAC;IACxC,CAAC,uBAAuB,EAAE,gBAAgB,CAAC;IAC3C,CAAC,QAAQ,EAAE,iBAAiB,CAAC;IAC7B,CAAC,SAAS,EAAE,aAAa,CAAC;IAC1B,CAAC,qBAAqB,EAAE,sBAAsB,CAAC;IAC/C,CAAC,SAAS,EAAE,uCAAuC,CAAC;IACpD,CAAC,mBAAmB,EAAE,uCAAuC,CAAC;IAC9D,CAAC,cAAc,EAAE,cAAc,CAAC;IAChC,CAAC,WAAW,EAAE,aAAa,CAAC;IAC5B,CAAC,SAAS,EAAE,8BAA8B,CAAC;IAC3C,CAAC,iBAAiB,EAAE,eAAe,CAAC;IACpC,CAAC,gBAAgB,EAAE,qBAAqB,CAAC;IACzC,CAAC,cAAc,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,MAAM,UAAU,SAAS;IACrB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACrB,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,QAAQ,EAAE,CAAC;QACjC,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;IAC/C,CAAC;AACL,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { style } from '../../style.js';
|
|
2
2
|
import { runAgentTurn } from '../../run/index.js';
|
|
3
|
-
import { resetTodos } from '../../../tools/todo.js';
|
|
3
|
+
import { resetTodos } from '../../../tools/agent/todo.js';
|
|
4
4
|
/** 计划模式的只读工具集(含 glob,比 explore 多一个按名找文件)。 */
|
|
5
5
|
const PLAN_TOOLS = ['read_file', 'list_dir', 'grep', 'glob', 'bash_output'];
|
|
6
6
|
const PLAN_SYSTEM = '你现在处于「计划模式」。请**只用只读工具**(read_file / list_dir / grep / glob / bash_output)' +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../../src/cli/slash/system/plan.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../../src/cli/slash/system/plan.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { CheckpointManager } from '../../session/checkpoint.js';
|
|
2
|
+
import { LocalOS } from '../../../agent/os.js';
|
|
2
3
|
import { relative } from 'node:path';
|
|
3
4
|
import { style, stylize } from '../../style.js';
|
|
4
5
|
/** /revert:查看可用快照步骤,或一键回滚受影响文件 */
|
|
5
6
|
export async function handleRevert(arg, ctx) {
|
|
6
|
-
const
|
|
7
|
-
const
|
|
7
|
+
const os = ctx.os ?? new LocalOS();
|
|
8
|
+
const manager = new CheckpointManager(ctx.sessionId, ctx.cwd, undefined, os);
|
|
9
|
+
const steps = await manager.listSteps();
|
|
8
10
|
if (!arg) {
|
|
9
11
|
// 无参数:列出所有快照节点
|
|
10
12
|
if (steps.length === 0) {
|
|
@@ -13,7 +15,7 @@ export async function handleRevert(arg, ctx) {
|
|
|
13
15
|
}
|
|
14
16
|
console.log('可用快照节点(`/revert <步骤编号>` 即可执行回退):');
|
|
15
17
|
for (const step of steps) {
|
|
16
|
-
const info = manager.getStepInfo(step);
|
|
18
|
+
const info = await manager.getStepInfo(step);
|
|
17
19
|
if (!info)
|
|
18
20
|
continue;
|
|
19
21
|
const timeStr = new Date(info.timestamp).toLocaleTimeString();
|
|
@@ -31,7 +33,7 @@ export async function handleRevert(arg, ctx) {
|
|
|
31
33
|
console.log(style.error(`错误:请输入有效的快照步骤编号(当前可用: ${steps.join(', ')})。`));
|
|
32
34
|
return;
|
|
33
35
|
}
|
|
34
|
-
const info = manager.getStepInfo(step);
|
|
36
|
+
const info = await manager.getStepInfo(step);
|
|
35
37
|
if (!info) {
|
|
36
38
|
console.log(style.error(`错误:未找到 Step ${step} 的快照信息。`));
|
|
37
39
|
return;
|
|
@@ -43,7 +45,7 @@ export async function handleRevert(arg, ctx) {
|
|
|
43
45
|
const rel = relative(ctx.cwd, fileInfo.absolutePath);
|
|
44
46
|
const actLabel = fileInfo.action === 'create' ? '新建' : '修改';
|
|
45
47
|
console.log(style.label(`[${i + 1}] ${rel} (${actLabel})`));
|
|
46
|
-
const diff = manager.getFileDiff(step, pathHash, fileInfo);
|
|
48
|
+
const diff = await manager.getFileDiff(step, pathHash, fileInfo);
|
|
47
49
|
if (!diff) {
|
|
48
50
|
console.log(style.muted(' (文件不存在或无法读取)'));
|
|
49
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"revert.js","sourceRoot":"","sources":["../../../../src/cli/slash/system/revert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"revert.js","sourceRoot":"","sources":["../../../../src/cli/slash/system/revert.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/stats/index.js
CHANGED
|
@@ -17,8 +17,13 @@ const CONTEXT_LIMIT = {
|
|
|
17
17
|
// OpenAI / 通义千问 / DeepSeek 常见值
|
|
18
18
|
'qwen-plus': 131072, // 128K
|
|
19
19
|
'qwen-max': 32768, // 32K
|
|
20
|
+
'qwen3.6-flash': 1048576, // 1M
|
|
21
|
+
'qwen3.7-plus': 1048576, // 1M
|
|
22
|
+
'qwen3.7-max': 1048576, // 1M
|
|
20
23
|
'deepseek-chat': 65536, // 64K
|
|
21
24
|
'deepseek-coder': 65536, // 64K
|
|
25
|
+
'deepseek-v4-flash': 1048576, // 1M
|
|
26
|
+
'deepseek-v4-pro': 1048576, // 1M
|
|
22
27
|
'gpt-4o': 128000, // 128K
|
|
23
28
|
'gpt-4o-mini': 128000, // 128K
|
|
24
29
|
'gpt-4': 8192, // 8K
|
|
@@ -79,7 +84,7 @@ export function addStats(a, b) {
|
|
|
79
84
|
export function formatStats(stats, model) {
|
|
80
85
|
const ctx = model ? getContextLimit(model) : DEFAULT_CONTEXT_LIMIT;
|
|
81
86
|
const ratio = ctx > 0 ? (stats.totalTokens / ctx) * 100 : 0;
|
|
82
|
-
return `上下文: ${stats.totalTokens
|
|
87
|
+
return `上下文: ${fmtCompact(stats.totalTokens)} / ${fmtCompact(ctx)} tokens (${ratio.toFixed(1)}%) 输入: ${fmtCompact(stats.promptTokens)} 输出: ${fmtCompact(stats.completionTokens)}`;
|
|
83
88
|
}
|
|
84
89
|
/** 把大数字格式化为 k/M,便于阅读。 */
|
|
85
90
|
function fmtCompact(n) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/stats/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/stats/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,215 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Usage 统计持久化与成本估算。
|
|
3
|
+
*
|
|
4
|
+
* 每次 AI 回合结束时,把真实 token 消耗(优先后端返回,缺失时字符估算)
|
|
5
|
+
* 追加到 ~/.ccli/usage.jsonl。/account 可读取并展示本月累计与预估成本。
|
|
6
|
+
*
|
|
7
|
+
* 成本单价为常见模型的近似值,仅供参考;未知模型不估算成本。
|
|
8
|
+
*/
|
|
9
|
+
import { homedir } from 'node:os';
|
|
10
|
+
import { join } from 'node:path';
|
|
11
|
+
import { appendFileSync, existsSync, mkdirSync, readFileSync, } from 'node:fs';
|
|
12
|
+
/** 默认 usage 文件路径。 */
|
|
13
|
+
export function usagePath() {
|
|
14
|
+
return join(homedir(), '.ccli', 'usage.jsonl');
|
|
15
|
+
}
|
|
16
|
+
/**
|
|
17
|
+
* 常见模型单价(USD / 1M tokens)。
|
|
18
|
+
* 价格为近似值,仅用于 /account 展示预估成本;实际账单以各平台为准。
|
|
19
|
+
* 匹配规则:先精确匹配,再前缀匹配(如 qwen-plus-0919 → qwen-plus)。
|
|
20
|
+
*/
|
|
21
|
+
const MODEL_PRICES = {
|
|
22
|
+
// 通义千问(OpenAI 兼容端点常见模型)
|
|
23
|
+
'qwen-plus': { prompt: 0.8, completion: 2.0 },
|
|
24
|
+
'qwen-max': { prompt: 2.4, completion: 9.6 },
|
|
25
|
+
'qwen-turbo': { prompt: 0.5, completion: 2.0 },
|
|
26
|
+
'qwen-vl-plus': { prompt: 2.0, completion: 5.0 },
|
|
27
|
+
'qwen3.6-flash': { prompt: 0.166, completion: 0.993 },
|
|
28
|
+
'qwen3.7-plus': { prompt: 0.276, completion: 1.103 },
|
|
29
|
+
'qwen3.7-max': { prompt: 1.655, completion: 4.966 },
|
|
30
|
+
// OpenAI 官方
|
|
31
|
+
'gpt-4o': { prompt: 2.5, completion: 10.0 },
|
|
32
|
+
'gpt-4o-mini': { prompt: 0.15, completion: 0.6 },
|
|
33
|
+
'o3-mini': { prompt: 1.1, completion: 4.4 },
|
|
34
|
+
// Anthropic
|
|
35
|
+
'claude-3-5-haiku-20241022': { prompt: 0.8, completion: 4.0 },
|
|
36
|
+
'claude-sonnet-4-5': { prompt: 3.0, completion: 15.0 },
|
|
37
|
+
'claude-opus-4-5': { prompt: 15.0, completion: 75.0 },
|
|
38
|
+
// DeepSeek
|
|
39
|
+
'deepseek-chat': { prompt: 0.14, completion: 0.28 },
|
|
40
|
+
'deepseek-coder': { prompt: 0.14, completion: 0.28 },
|
|
41
|
+
'deepseek-reasoner': { prompt: 0.55, completion: 2.19 },
|
|
42
|
+
'deepseek-v4-flash': { prompt: 0.14, completion: 0.28 },
|
|
43
|
+
'deepseek-v4-pro': { prompt: 0.435, completion: 0.87 },
|
|
44
|
+
// Gemini
|
|
45
|
+
'gemini-2.5-flash': { prompt: 0.15, completion: 0.6 },
|
|
46
|
+
'gemini-2.5-pro': { prompt: 1.25, completion: 10.0 },
|
|
47
|
+
// 智谱 GLM
|
|
48
|
+
'glm-4': { prompt: 1.0, completion: 1.0 },
|
|
49
|
+
'glm-4-flash': { prompt: 0.0, completion: 0.0 },
|
|
50
|
+
};
|
|
51
|
+
/** 查找模型单价;先精确匹配,再前缀匹配。 */
|
|
52
|
+
function findPrice(model) {
|
|
53
|
+
const exact = MODEL_PRICES[model];
|
|
54
|
+
if (exact)
|
|
55
|
+
return exact;
|
|
56
|
+
for (const key of Object.keys(MODEL_PRICES)) {
|
|
57
|
+
if (model.startsWith(key))
|
|
58
|
+
return MODEL_PRICES[key];
|
|
59
|
+
}
|
|
60
|
+
return undefined;
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* 估算一次调用的成本(USD)。
|
|
64
|
+
* 未知模型返回 undefined。
|
|
65
|
+
*/
|
|
66
|
+
export function estimateCost(_provider, model, promptTokens, completionTokens) {
|
|
67
|
+
const price = findPrice(model);
|
|
68
|
+
if (!price)
|
|
69
|
+
return undefined;
|
|
70
|
+
const cost = (promptTokens / 1_000_000) * price.prompt +
|
|
71
|
+
(completionTokens / 1_000_000) * price.completion;
|
|
72
|
+
return cost;
|
|
73
|
+
}
|
|
74
|
+
/**
|
|
75
|
+
* 追加一条 usage 记录。
|
|
76
|
+
* 任何失败(磁盘满、权限等)都静默吞掉,不中断会话。
|
|
77
|
+
*/
|
|
78
|
+
export function appendUsage(record) {
|
|
79
|
+
try {
|
|
80
|
+
const path = usagePath();
|
|
81
|
+
mkdirSync(join(homedir(), '.ccli'), { recursive: true });
|
|
82
|
+
const estimatedCostUSD = estimateCost(record.provider, record.model, record.promptTokens, record.completionTokens);
|
|
83
|
+
const line = JSON.stringify({
|
|
84
|
+
ts: new Date().toISOString(),
|
|
85
|
+
...record,
|
|
86
|
+
...(estimatedCostUSD !== undefined
|
|
87
|
+
? { estimatedCostUSD }
|
|
88
|
+
: {}),
|
|
89
|
+
}) + '\n';
|
|
90
|
+
appendFileSync(path, line, 'utf8');
|
|
91
|
+
}
|
|
92
|
+
catch {
|
|
93
|
+
// usage 记录不能打断会话
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
/** 读取全部 usage 记录;文件不存在或损坏时返回空数组。 */
|
|
97
|
+
export function readUsageRecords() {
|
|
98
|
+
const path = usagePath();
|
|
99
|
+
if (!existsSync(path))
|
|
100
|
+
return [];
|
|
101
|
+
const raw = readFileSync(path, 'utf8');
|
|
102
|
+
if (!raw.trim())
|
|
103
|
+
return [];
|
|
104
|
+
const out = [];
|
|
105
|
+
for (const line of raw.split('\n')) {
|
|
106
|
+
if (!line.trim())
|
|
107
|
+
continue;
|
|
108
|
+
try {
|
|
109
|
+
out.push(JSON.parse(line));
|
|
110
|
+
}
|
|
111
|
+
catch {
|
|
112
|
+
// 跳过坏行
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
return out;
|
|
116
|
+
}
|
|
117
|
+
/**
|
|
118
|
+
* 按条件读取 usage,并按模型分组汇总。
|
|
119
|
+
* 返回数组按总 token 数降序排列。
|
|
120
|
+
*/
|
|
121
|
+
export function readUsageByModel(filters = {}) {
|
|
122
|
+
const records = readUsageRecords().filter((r) => {
|
|
123
|
+
if (filters.provider && r.provider !== filters.provider)
|
|
124
|
+
return false;
|
|
125
|
+
if (filters.since) {
|
|
126
|
+
const ts = new Date(r.ts).getTime();
|
|
127
|
+
if (ts < filters.since.getTime())
|
|
128
|
+
return false;
|
|
129
|
+
}
|
|
130
|
+
if (filters.until) {
|
|
131
|
+
const ts = new Date(r.ts).getTime();
|
|
132
|
+
if (ts > filters.until.getTime())
|
|
133
|
+
return false;
|
|
134
|
+
}
|
|
135
|
+
return true;
|
|
136
|
+
});
|
|
137
|
+
const byModel = new Map();
|
|
138
|
+
for (const r of records) {
|
|
139
|
+
const existing = byModel.get(r.model);
|
|
140
|
+
const next = {
|
|
141
|
+
promptTokens: existing ? existing.promptTokens + r.promptTokens : r.promptTokens,
|
|
142
|
+
completionTokens: existing
|
|
143
|
+
? existing.completionTokens + r.completionTokens
|
|
144
|
+
: r.completionTokens,
|
|
145
|
+
totalTokens: existing ? existing.totalTokens + r.totalTokens : r.totalTokens,
|
|
146
|
+
estimatedCostUSD: (existing ? existing.estimatedCostUSD : 0) + (r.estimatedCostUSD ?? 0),
|
|
147
|
+
recordCount: existing ? existing.recordCount + 1 : 1,
|
|
148
|
+
};
|
|
149
|
+
byModel.set(r.model, next);
|
|
150
|
+
}
|
|
151
|
+
return Array.from(byModel.entries())
|
|
152
|
+
.map(([model, summary]) => ({ model, summary }))
|
|
153
|
+
.sort((a, b) => b.summary.totalTokens - a.summary.totalTokens);
|
|
154
|
+
}
|
|
155
|
+
/**
|
|
156
|
+
* 按条件读取 usage 并汇总。
|
|
157
|
+
* 不传条件时返回全部记录累计。
|
|
158
|
+
*/
|
|
159
|
+
export function readUsageSummary(filters = {}) {
|
|
160
|
+
const records = readUsageRecords().filter((r) => {
|
|
161
|
+
if (filters.provider && r.provider !== filters.provider)
|
|
162
|
+
return false;
|
|
163
|
+
if (filters.model && r.model !== filters.model)
|
|
164
|
+
return false;
|
|
165
|
+
if (filters.since) {
|
|
166
|
+
const ts = new Date(r.ts).getTime();
|
|
167
|
+
if (ts < filters.since.getTime())
|
|
168
|
+
return false;
|
|
169
|
+
}
|
|
170
|
+
if (filters.until) {
|
|
171
|
+
const ts = new Date(r.ts).getTime();
|
|
172
|
+
if (ts > filters.until.getTime())
|
|
173
|
+
return false;
|
|
174
|
+
}
|
|
175
|
+
return true;
|
|
176
|
+
});
|
|
177
|
+
return records.reduce((sum, r) => ({
|
|
178
|
+
promptTokens: sum.promptTokens + r.promptTokens,
|
|
179
|
+
completionTokens: sum.completionTokens + r.completionTokens,
|
|
180
|
+
totalTokens: sum.totalTokens + r.totalTokens,
|
|
181
|
+
estimatedCostUSD: sum.estimatedCostUSD + (r.estimatedCostUSD ?? 0),
|
|
182
|
+
recordCount: sum.recordCount + 1,
|
|
183
|
+
}), {
|
|
184
|
+
promptTokens: 0,
|
|
185
|
+
completionTokens: 0,
|
|
186
|
+
totalTokens: 0,
|
|
187
|
+
estimatedCostUSD: 0,
|
|
188
|
+
recordCount: 0,
|
|
189
|
+
});
|
|
190
|
+
}
|
|
191
|
+
/** 获取本月起止时间。 */
|
|
192
|
+
export function thisMonthRange() {
|
|
193
|
+
const now = new Date();
|
|
194
|
+
const since = new Date(now.getFullYear(), now.getMonth(), 1);
|
|
195
|
+
const until = new Date(now.getFullYear(), now.getMonth() + 1, 1);
|
|
196
|
+
return { since, until };
|
|
197
|
+
}
|
|
198
|
+
/** 把 token 数格式化为紧凑形式(如 1.2K、3.4M)。 */
|
|
199
|
+
export function formatTokensCompact(n) {
|
|
200
|
+
if (n >= 1_000_000) {
|
|
201
|
+
return `${(n / 1_000_000).toFixed(1)}M`;
|
|
202
|
+
}
|
|
203
|
+
if (n >= 1_000) {
|
|
204
|
+
return `${(n / 1_000).toFixed(1)}K`;
|
|
205
|
+
}
|
|
206
|
+
return String(n);
|
|
207
|
+
}
|
|
208
|
+
/** 格式化 usage 摘要供 /account 展示。 */
|
|
209
|
+
export function formatUsageSummary(summary) {
|
|
210
|
+
const cost = summary.estimatedCostUSD > 0
|
|
211
|
+
? ` 预估成本: $${summary.estimatedCostUSD.toFixed(4)}`
|
|
212
|
+
: '';
|
|
213
|
+
return `本月: ${formatTokensCompact(summary.totalTokens)} tokens(输入 ${formatTokensCompact(summary.promptTokens)} / 输出 ${formatTokensCompact(summary.completionTokens)})${cost}`.trim();
|
|
214
|
+
}
|
|
215
|
+
//# sourceMappingURL=usage.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"usage.js","sourceRoot":"","sources":["../../../src/cli/stats/usage.ts"],"names":[],"mappings":"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"}
|