@tocca-systems/twp-cli 0.14.0 → 0.14.1
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/CHANGELOG.public.md +8 -0
- package/dist/{app-OOHRCRTG.js → app-BSEVWRJY.js} +12 -12
- package/dist/{chunk-NNOYO67O.js → chunk-4WK2ECUX.js} +4 -2
- package/dist/{chunk-KIOMZ2ZU.js → chunk-ZVZL4QHS.js} +31 -30
- package/dist/cli.js +5 -5
- package/dist/{commands-MQ32SI5I.js → commands-S7RTRVR5.js} +14 -13
- package/dist/{oneshot-4RW7KWY5.js → oneshot-FI5F5SP5.js} +5 -5
- package/package.json +5 -2
package/CHANGELOG.public.md
CHANGED
|
@@ -11,6 +11,14 @@
|
|
|
11
11
|
`CHANGELOG.md` に残してあります。顧客向けの履歴は public 公開以降を対象とします。
|
|
12
12
|
-->
|
|
13
13
|
|
|
14
|
+
## 0.14.1
|
|
15
|
+
|
|
16
|
+
`/context` に、いま効いている `--permission-mode` と監査ログの置き場所を表示するようになりました。
|
|
17
|
+
|
|
18
|
+
- `permission-mode: denyAll（read を含む全ツールを拒否）` のように、何が拒否されるかまで出ます。指定していないときは「未指定（モードの方針のまま）」と出ます。
|
|
19
|
+
- `監査ログ: <パス>` … このセッションの監査ログの置き場所です。まだツールを1本も実行していない間は「未作成・最初のツール実行で作る」と付きます（ファイルは最初のツール実行で作られます）。
|
|
20
|
+
- 監査ログの各行に、ツール呼び出しごとの相関IDが載るようになりました。判定（`decision`）と結果（`result`）を行の順序ではなく ID で突き合わせられます。
|
|
21
|
+
|
|
14
22
|
## 0.14.0
|
|
15
23
|
|
|
16
24
|
ループが計画を立てるかどうかを設定で切り替えられるようになりました（`plan_enabled` / 環境変数 `PLAN_ENABLED`・既定は従来どおり計画します）。
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { createRequire as __twpCreateRequire } from 'node:module';
|
|
2
2
|
const require = __twpCreateRequire(import.meta.url);
|
|
3
|
-
import{RESIDENT_TOKEN_CAP,buildResidentSet,buildSystemPrompt,createAuditLogger,currentBranch,displayCwd,runTurn}from"./chunk-
|
|
4
|
-
toModelInfos}from"./chunk-RQFG3OUL.js";import{checkMinSupportedVersion,isBelowMinSupported,minSupportedBlockMessage}from"./chunk-DXXFUNYN.js";import"./chunk-PMOUHEJQ.js";import"./chunk-63LDNYGW.js";import"./chunk-NERYSBA4.js";import"./chunk-RZVI6PMW.js";import{proxyDiagnostics}from"./chunk-J7QYPKVK.js";import{stripTerminalControls}from"./chunk-NHYMHCAT.js";import{__commonJS,__export,__require,__toESM}from"./chunk-VSJBJXZO.js";var require_react_production=__commonJS({"node_modules/react/cjs/react.production.js"(exports){"use strict";var REACT_ELEMENT_TYPE=Symbol.for("react.transitional.element");var REACT_PORTAL_TYPE=Symbol.for("react.portal");var REACT_FRAGMENT_TYPE=Symbol.for("react.fragment");var REACT_STRICT_MODE_TYPE=Symbol.for("react.strict_mode");var REACT_PROFILER_TYPE=Symbol.for("react.profiler");var REACT_CONSUMER_TYPE=Symbol.for("react.consumer");var REACT_CONTEXT_TYPE=Symbol.for("react.context");var REACT_FORWARD_REF_TYPE=Symbol.
|
|
3
|
+
import{RESIDENT_TOKEN_CAP,buildResidentSet,buildSystemPrompt,createAuditLogger,currentBranch,describeAuditLog,displayCwd,runTurn}from"./chunk-ZVZL4QHS.js";import"./chunk-N2UVRM3Z.js";import{applyPermissionMode,checkPermission,describePermissionMode,getMode,isModeId,nextMode}from"./chunk-4WK2ECUX.js";import{require_fuzzysort}from"./chunk-DIMZRTLE.js";import{isFullWidth,isWide,stringWidth,stripAnsi}from"./chunk-WVS4W5FY.js";import{RelayError,builtinCatalog,createRuntime,
|
|
4
|
+
loadCachedCatalog,modelLabel,pickModel,toModelInfos}from"./chunk-RQFG3OUL.js";import{checkMinSupportedVersion,isBelowMinSupported,minSupportedBlockMessage}from"./chunk-DXXFUNYN.js";import"./chunk-PMOUHEJQ.js";import"./chunk-63LDNYGW.js";import"./chunk-NERYSBA4.js";import"./chunk-RZVI6PMW.js";import{proxyDiagnostics}from"./chunk-J7QYPKVK.js";import{stripTerminalControls}from"./chunk-NHYMHCAT.js";import{__commonJS,__export,__require,__toESM}from"./chunk-VSJBJXZO.js";var require_react_production=__commonJS({"node_modules/react/cjs/react.production.js"(exports){"use strict";var REACT_ELEMENT_TYPE=Symbol.for("react.transitional.element");var REACT_PORTAL_TYPE=Symbol.for("react.portal");var REACT_FRAGMENT_TYPE=Symbol.for("react.fragment");var REACT_STRICT_MODE_TYPE=Symbol.for("react.strict_mode");var REACT_PROFILER_TYPE=Symbol.for("react.profiler");var REACT_CONSUMER_TYPE=Symbol.for("react.consumer");var REACT_CONTEXT_TYPE=Symbol.for("react.context");var REACT_FORWARD_REF_TYPE=Symbol.
|
|
5
5
|
for("react.forward_ref");var REACT_SUSPENSE_TYPE=Symbol.for("react.suspense");var REACT_MEMO_TYPE=Symbol.for("react.memo");var REACT_LAZY_TYPE=Symbol.for("react.lazy");var REACT_ACTIVITY_TYPE=Symbol.for("react.activity");var REACT_VIEW_TRANSITION_TYPE=Symbol.for("react.view_transition");var MAYBE_ITERATOR_SYMBOL=Symbol.iterator;function getIteratorFn(maybeIterable){if(null===maybeIterable||"object"!==typeof maybeIterable)return null;maybeIterable=MAYBE_ITERATOR_SYMBOL&&maybeIterable[MAYBE_ITERATOR_SYMBOL]||
|
|
6
6
|
maybeIterable["@@iterator"];return"function"===typeof maybeIterable?maybeIterable:null}var ReactNoopUpdateQueue={isMounted:function(){return false},enqueueForceUpdate:function(){},enqueueReplaceState:function(){},enqueueSetState:function(){}};var assign=Object.assign;var emptyObject={};function Component(props,context,updater){this.props=props;this.context=context;this.refs=emptyObject;this.updater=updater||ReactNoopUpdateQueue}Component.prototype.isReactComponent={};Component.prototype.setState=
|
|
7
7
|
function(partialState,callback){if("object"!==typeof partialState&&"function"!==typeof partialState&&null!=partialState)throw Error("takes an object of state variables to update or a function which returns an object of state variables.");this.updater.enqueueSetState(this,partialState,callback,"setState")};Component.prototype.forceUpdate=function(callback){this.updater.enqueueForceUpdate(this,callback,"forceUpdate")};function ComponentDummy(){}ComponentDummy.prototype=Component.prototype;function PureComponent2(props,context,updater){
|
|
@@ -1287,16 +1287,16 @@ notice",tone:"info",text:`\u30E2\u30FC\u30C9\u3092 ${getMode(to).label}\uFF08${t
|
|
|
1287
1287
|
xit \u306F /quit \u3082\u53EF\uFF09`,...PENDING_COMMANDS.length>0?[`\u672A\u5B9F\u88C5\u306E\u305F\u3081\u767B\u9332\u3057\u3066\u3044\u306A\u3044\u30B3\u30DE\u30F3\u30C9: ${PENDING_COMMANDS.map(c=>c.name).join(" ")}`]:[],"\u30AD\u30FC: Shift+Tab \u307E\u305F\u306F Alt+M \u3067\u30E2\u30FC\u30C9\u5DE1\u56DE \xB7 Ctrl+R \u3067\u76F4\u524D\u306E\u30C4\u30FC\u30EB\u51FA\u529B\u3092\u5C55\u958B","\u6539\u884C: Shift+Enter\uFF08kitty \u5BFE\u5FDC\u7AEF\u672B\uFF09\xB7 Ctrl+J\uFF08\u5168\u7AEF\u672B\uFF09\xB7 \\ \u3092\u6253\u3063\u3066\u304B\u3089 Enter \u3067\u3082\u53EF"].
|
|
1288
1288
|
join("\n")});return;case"/context":{const snapshot=runtime.context.snapshot();const t=snapshot.totals;const resident=buildResidentSet(getMode(modeRef.current),{...permissionMode!==void 0?{permissionMode}:{}});commit({kind:"notice",tone:"info",text:[`\u30E2\u30C7\u30EB: ${modelLabel(model)}\uFF08\u30E2\u30FC\u30C9\u3068\u306F\u72EC\u7ACB\uFF09`,`\u30E2\u30FC\u30C9: ${getMode(modeRef.current).label} \u2014 \u6709\u52B9\u30C4\u30FC\u30EB glob: ${getMode(modeRef.current).tools.join(" ")}`,`\u63A5\u7D9A\u5148: ${runtime.
|
|
1289
1289
|
relayUrl}\uFF08\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB: ${runtime.profileName}\uFF09`,`\u30BF\u30FC\u30F3\u6570: ${snapshot.turns} \xB7 \u76F4\u8FD1\u306E\u30D7\u30ED\u30F3\u30D7\u30C8\u9577: ${snapshot.lastPromptTokens} tok`,`\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u6B8B\u91CF: ${snapshot.remainingPercent}%\uFF08\u7A93 200,000 tok \u306E\u6982\u7B97\uFF09`,`\u5B9F\u6E2C\u30C8\u30FC\u30AF\u30F3\u5408\u8A08: input ${t.inputTokens} / cache_read ${t.cacheReadTokens} / cache_write ${t.cacheWriteTokens} / \
|
|
1290
|
-
output ${t.outputTokens}`,...snapshot.droppedMessages>0?[`\u4E0A\u9650\u306E\u305F\u3081\u843D\u3068\u3057\u305F\u3084\u308A\u53D6\u308A: ${snapshot.droppedMessages} \u4EF6`]:[]
|
|
1291
|
-
dropped.join(" ")}`]:[],"TWP API \u306E\u30C4\u30FC\u30EB\uFF08\u30E1\u30BF\u30C4\u30FC\u30EB\u30FB\u30AB\u30BF\u30ED\u30B0\u914D\u4FE1\uFF09\u306F\u5225\u30BF\u30B9\u30AF\u3067\u8F09\u308A\u307E\u3059"].join("\n")});return}case"/demo":void runDemo("\uFF08\u30C7\u30E2\u518D\u751F\uFF09\u30C4\u30FC\u30EB\u30AB\u30FC\u30C9\u3068\u6A29\u9650\u30C0\u30A4\u30A2\u30ED\u30B0");
|
|
1292
|
-
exit,model,runDemo,runtime]);const submit=(0,import_react38.useCallback)(()=>{if(busyRef.current){commit({kind:"notice",tone:"warn",text:"\u5B9F\u884C\u4E2D\u3067\u3059\u3002Ctrl+C \u3067\u4E2D\u65AD\u3057\u3066\u304B\u3089\u9001\u4FE1\u3057\u3066\u304F\u3060\u3055\u3044\uFF08\u5165\u529B\u306F\u4FDD\u6301\u3057\u3066\u3044\u307E\u3059\uFF09"});return}
|
|
1293
|
-
text)},[clearBuffer,commit,runCommand,runTurn2]);const paletteItems=(0,import_react38.useMemo)(()=>paletteFor(buffer.text,mode),[buffer.text,mode]);const onKey=(0,import_react38.useCallback)(ev=>{setKeyLog(prev=>[...prev.slice(-49),ev]);if(ev.name==="ctrl-d"){exit();return}if(ev.name==="ctrl-c"){if(busyRef.current){if(abortRef.current)return;
|
|
1294
|
-
current){commit({kind:"notice",tone:"warn",text:"\u4E2D\u65AD\u3057\u307E\u3057\u305F\uFF08Ctrl+C\uFF09"})}return}if(bufferRef.current.text!==""){clearBuffer();return}if(ctrlCArmed){exit();return}setCtrlCArmed(true);commit({kind:"notice",tone:"info",text:"\u3082\u3046\u4E00\u5EA6 Ctrl+C \u3067\u7D42\u4E86\u3057\u307E\u3059\uFF08Ctrl+D \u3067\u3082\u7D42\u4E86\uFF09"});
|
|
1295
|
-
name==="ctrl-r"){const last=lastToolRef.current;if(last)commit({kind:"tool",run:{...last,summary:`${last.summary}\uFF08\u5C55\u958B\uFF09`},expanded:true});return}if(overlay==="permission"){const resolve=permissionResolver.current;if(!resolve)return;if(ev.name==="paste"&&ev.value){const pasted=ev.value.replace(/\r\n?/g,"\n");setBuffer(b=>insert(b,pasted));return}const choices=pendingPermission?
|
|
1296
|
-
name==="down")setSelected(s=>Math.min(choices.length-1,s+1));else if(ev.name==="enter")resolve(choices[selectedRef.current]?.key??"no");else if(ev.name==="escape")resolve("no");else if(ev.name==="char"&&ev.value&&"123".includes(ev.value)){resolve(choices[Number(ev.value)-1]?.key??"no")}return}if(overlay==="doctor"){if(ev.name==="escape")setOverlay("none");return}if(overlay==="model"){if(ev.
|
|
1297
|
-
1,s+1));else if(ev.name==="escape")setOverlay("none");else if(ev.name==="enter"){const pickedId=catalog.ids[selectedRef.current];if(pickedId!==void 0){setModel(pickedId);commit({kind:"notice",tone:"info",text:`\u30E2\u30C7\u30EB\u3092 ${modelLabel(pickedId)} \u306B\u5207\u308A\u66FF\u3048\u307E\u3057\u305F\uFF08\u30E2\u30FC\u30C9\u306F ${getMode(modeRef.current).label} \u306E\u307E\u307E\uFF09`})}
|
|
1298
|
-
current);if(palette.length>0){if(ev.name==="up"){setSelected(s=>Math.max(0,s-1));return}if(ev.name==="down"){setSelected(s=>Math.min(palette.length-1,s+1));return}if(ev.name==="tab"){const picked=palette[selectedRef.current];if(picked){setBuffer(()=>({text:picked.name,cursor:picked.name.length}));setSelected(0)}return}if(ev.name==="enter"){const picked=palette[selectedRef.current];if(picked){clearBuffer();
|
|
1299
|
-
char":if(ev.value){setBuffer(b=>insert(b,ev.value??""));setSelected(0)}return;case"paste":if(ev.value){const pasted=ev.value.replace(/\r\n?/g,"\n");setBuffer(b=>insert(b,pasted));setSelected(0)}return;case"newline":setBuffer(b=>insert(b,"\n"));return;case"enter":{const b=bufferRef.current;if(b.cursor>0&&b.text[b.cursor-1]==="\\"){setBuffer(prev=>({text:`${prev.text.slice(0,prev.cursor-1)}
|
|
1290
|
+
output ${t.outputTokens}`,...snapshot.droppedMessages>0?[`\u4E0A\u9650\u306E\u305F\u3081\u843D\u3068\u3057\u305F\u3084\u308A\u53D6\u308A: ${snapshot.droppedMessages} \u4EF6`]:[],`permission-mode: ${describePermissionMode(permissionMode)}`,`\u76E3\u67FB\u30ED\u30B0: ${describeAuditLog(audit)}`,`\u5E38\u99D0\u30C4\u30FC\u30EB: ${resident.tools.length} \u672C / \u30B9\u30AD\u30FC\u30DE\u6982\u7B97 ${resident.tokens} tok\uFF08\u4E0A\u9650 ${RESIDENT_TOKEN_CAP} tok\uFF09`,` ${resident.tools.map(t2=>t2.
|
|
1291
|
+
name).join(" ")||"\uFF08\u306A\u3057\uFF09"}`,...resident.dropped.length>0?[` \u4E0A\u9650\u8D85\u904E\u3067\u5916\u3057\u305F\u30C4\u30FC\u30EB: ${resident.dropped.join(" ")}`]:[],"TWP API \u306E\u30C4\u30FC\u30EB\uFF08\u30E1\u30BF\u30C4\u30FC\u30EB\u30FB\u30AB\u30BF\u30ED\u30B0\u914D\u4FE1\uFF09\u306F\u5225\u30BF\u30B9\u30AF\u3067\u8F09\u308A\u307E\u3059"].join("\n")});return}case"/demo":void runDemo("\uFF08\u30C7\u30E2\u518D\u751F\uFF09\u30C4\u30FC\u30EB\u30AB\u30FC\u30C9\u3068\u6A29\u9650\u30C0\u30A4\u30A2\u30ED\u30B0");
|
|
1292
|
+
return;default:commit({kind:"notice",tone:"warn",text:`\u4E0D\u660E\u306A\u30B3\u30DE\u30F3\u30C9: ${name}`})}},[audit,catalog,commit,exit,model,permissionMode,runDemo,runtime]);const submit=(0,import_react38.useCallback)(()=>{if(busyRef.current){commit({kind:"notice",tone:"warn",text:"\u5B9F\u884C\u4E2D\u3067\u3059\u3002Ctrl+C \u3067\u4E2D\u65AD\u3057\u3066\u304B\u3089\u9001\u4FE1\u3057\u3066\u304F\u3060\u3055\u3044\uFF08\u5165\u529B\u306F\u4FDD\u6301\u3057\u3066\u3044\u307E\u3059\uFF09"});return}
|
|
1293
|
+
const text=bufferRef.current.text.trim();clearBuffer();setOverlay("none");if(text==="")return;if(text.startsWith("/")){runCommand(text);return}void runTurn2(text)},[clearBuffer,commit,runCommand,runTurn2]);const paletteItems=(0,import_react38.useMemo)(()=>paletteFor(buffer.text,mode),[buffer.text,mode]);const onKey=(0,import_react38.useCallback)(ev=>{setKeyLog(prev=>[...prev.slice(-49),ev]);if(ev.name==="ctrl-d"){exit();return}if(ev.name==="ctrl-c"){if(busyRef.current){if(abortRef.current)return;
|
|
1294
|
+
abortRef.current=true;streamAbortRef.current?.abort();permissionResolver.current?.("no");stream.cancel();abortSleep();setRunningTool(null);if(!streamAbortRef.current){commit({kind:"notice",tone:"warn",text:"\u4E2D\u65AD\u3057\u307E\u3057\u305F\uFF08Ctrl+C\uFF09"})}return}if(bufferRef.current.text!==""){clearBuffer();return}if(ctrlCArmed){exit();return}setCtrlCArmed(true);commit({kind:"notice",tone:"info",text:"\u3082\u3046\u4E00\u5EA6 Ctrl+C \u3067\u7D42\u4E86\u3057\u307E\u3059\uFF08Ctrl+D \u3067\u3082\u7D42\u4E86\uFF09"});
|
|
1295
|
+
return}setCtrlCArmed(false);if(ev.name==="shift-tab"||ev.name==="alt-m"){const to=nextMode(modeRef.current);setMode(to);return}if(ev.name==="ctrl-r"){const last=lastToolRef.current;if(last)commit({kind:"tool",run:{...last,summary:`${last.summary}\uFF08\u5C55\u958B\uFF09`},expanded:true});return}if(overlay==="permission"){const resolve=permissionResolver.current;if(!resolve)return;if(ev.name==="paste"&&ev.value){const pasted=ev.value.replace(/\r\n?/g,"\n");setBuffer(b=>insert(b,pasted));return}const choices=pendingPermission?
|
|
1296
|
+
choicesFor(pendingPermission):PERMISSION_CHOICES;if(ev.name==="up")setSelected(s=>Math.max(0,s-1));else if(ev.name==="down")setSelected(s=>Math.min(choices.length-1,s+1));else if(ev.name==="enter")resolve(choices[selectedRef.current]?.key??"no");else if(ev.name==="escape")resolve("no");else if(ev.name==="char"&&ev.value&&"123".includes(ev.value)){resolve(choices[Number(ev.value)-1]?.key??"no")}return}if(overlay==="doctor"){if(ev.name==="escape")setOverlay("none");return}if(overlay==="model"){if(ev.
|
|
1297
|
+
name==="up")setSelected(s=>Math.max(0,s-1));else if(ev.name==="down")setSelected(s=>Math.min(catalog.ids.length-1,s+1));else if(ev.name==="escape")setOverlay("none");else if(ev.name==="enter"){const pickedId=catalog.ids[selectedRef.current];if(pickedId!==void 0){setModel(pickedId);commit({kind:"notice",tone:"info",text:`\u30E2\u30C7\u30EB\u3092 ${modelLabel(pickedId)} \u306B\u5207\u308A\u66FF\u3048\u307E\u3057\u305F\uFF08\u30E2\u30FC\u30C9\u306F ${getMode(modeRef.current).label} \u306E\u307E\u307E\uFF09`})}
|
|
1298
|
+
setOverlay("none")}return}const palette=busyRef.current?[]:paletteFor(bufferRef.current.text,modeRef.current);if(palette.length>0){if(ev.name==="up"){setSelected(s=>Math.max(0,s-1));return}if(ev.name==="down"){setSelected(s=>Math.min(palette.length-1,s+1));return}if(ev.name==="tab"){const picked=palette[selectedRef.current];if(picked){setBuffer(()=>({text:picked.name,cursor:picked.name.length}));setSelected(0)}return}if(ev.name==="enter"){const picked=palette[selectedRef.current];if(picked){clearBuffer();
|
|
1299
|
+
runCommand(picked.name)}return}if(ev.name==="escape"){clearBuffer();return}}switch(ev.name){case"char":if(ev.value){setBuffer(b=>insert(b,ev.value??""));setSelected(0)}return;case"paste":if(ev.value){const pasted=ev.value.replace(/\r\n?/g,"\n");setBuffer(b=>insert(b,pasted));setSelected(0)}return;case"newline":setBuffer(b=>insert(b,"\n"));return;case"enter":{const b=bufferRef.current;if(b.cursor>0&&b.text[b.cursor-1]==="\\"){setBuffer(prev=>({text:`${prev.text.slice(0,prev.cursor-1)}
|
|
1300
1300
|
${prev.text.slice(prev.cursor)}`,cursor:prev.cursor}));return}submit();return}case"backspace":setBuffer(b=>{const prev=prevBoundary(b.text,b.cursor);return prev===b.cursor?b:{text:b.text.slice(0,prev)+b.text.slice(b.cursor),cursor:prev}});setSelected(0);return;case"delete":setBuffer(b=>({text:b.text.slice(0,b.cursor)+b.text.slice(nextBoundary(b.text,b.cursor)),cursor:b.cursor}));return;case"left":setBuffer(b=>({...b,cursor:prevBoundary(b.text,b.cursor)}));return;case"right":setBuffer(b=>({...b,cursor:nextBoundary(
|
|
1301
1301
|
b.text,b.cursor)}));return;case"home":setBuffer(b=>({...b,cursor:0}));return;case"end":setBuffer(b=>({...b,cursor:b.text.length}));return;case"ctrl-u":clearBuffer();return;default:return}},[busy,clearBuffer,commit,ctrlCArmed,exit,overlay,setBuffer,setSelected,stream,submit,runCommand]);useTerminalInput(onKey,setPasting);const streamRows=fitTailRows(stream.text,size.columns,budget.body).rows;const diffBudget=budget.body-12;const listBudget=Math.max(1,budget.body-6);const doctorBudget=Math.max(1,budget.
|
|
1302
1302
|
body-11-doctorNetworkRows(networkDiagnostics));return(0,import_jsx_runtime9.jsxs)(Box_default,{flexDirection:"column",children:[(0,import_jsx_runtime9.jsx)(Static,{items,children:item=>(0,import_jsx_runtime9.jsx)(ItemView,{item},item.id)}),(0,import_jsx_runtime9.jsxs)(Box_default,{flexDirection:"column",marginTop:1,children:[stream.streaming||stream.text!==""?(0,import_jsx_runtime9.jsx)(Box_default,{flexDirection:"column",children:streamRows.map((line,i)=>(0,import_jsx_runtime9.jsx)(Text,{wrap:"\
|
|
@@ -3,5 +3,7 @@ const require = __twpCreateRequire(import.meta.url);
|
|
|
3
3
|
var MODE_IDS=["dev","biz","plan"];function isModeId(value){return value!==void 0&&MODE_IDS.includes(value)}var MODES=[{id:"dev",label:"\u958B\u767A",color:"green",description:"\u30ED\u30FC\u30AB\u30EB\u30C4\u30FC\u30EB\u5168\u90E8 \uFF0B \u958B\u767A\u7CFB TWP \u30C9\u30E1\u30A4\u30F3\u5E38\u99D0",tools:["read_file","write_file","edit_file","bash","shell","glob","grep","git","twp_*"],permissions:{read_file:"allow",glob:"allow",grep:"allow",git:"allow",twp_get_task:"allow",twp_list_tasks:"allow",
|
|
4
4
|
twp_update_task:"ask",bash:"ask",shell:"ask",write_file:"ask",edit_file:"ask","*":"ask"}},{id:"biz",label:"\u696D\u52D9",color:"cyan",description:"TWP \u30C9\u30E1\u30A4\u30F3\u4E2D\u5FC3\u3002bash \u3068 write_file \u306F deny",tools:["twp_*","read_file","glob","grep"],permissions:{read_file:"allow",glob:"allow",grep:"allow",twp_get_task:"allow",twp_list_tasks:"allow",twp_update_task:"ask",bash:"deny",shell:"deny",write_file:"deny",edit_file:"deny","*":"ask"}},{id:"plan",label:"\u30D7\u30E9\u30F3",
|
|
5
5
|
color:"magenta",description:"\u8AAD\u307F\u53D6\u308A\u306E\u307F\u3002\u5168\u66F8\u304D\u8FBC\u307F deny",tools:["read_file","glob","grep","twp_get_*","twp_list_*"],permissions:{read_file:"allow",glob:"allow",grep:"allow",twp_get_task:"allow",twp_list_tasks:"allow",bash:"deny",shell:"deny",write_file:"deny",edit_file:"deny","*":"deny"}}];function getMode(id){const found=MODES.find(m=>m.id===id);if(!found)throw new Error(`unknown mode: ${id}`);return found}function nextMode(id){const i=MODES.findIndex(
|
|
6
|
-
m=>m.id===id);const next=MODES[(i+1)%MODES.length];return next?next.id:"dev"}function checkPermission(toolName,mode){return mode.permissions[toolName]??mode.permissions["*"]??"ask"}var PERMISSION_MODE_IDS=["plan","acceptEdits","denyAll"];function isPermissionModeId(value){return value!==void 0&&PERMISSION_MODE_IDS.includes(value)}function
|
|
7
|
-
|
|
6
|
+
m=>m.id===id);const next=MODES[(i+1)%MODES.length];return next?next.id:"dev"}function checkPermission(toolName,mode){return mode.permissions[toolName]??mode.permissions["*"]??"ask"}var PERMISSION_MODE_IDS=["plan","acceptEdits","denyAll"];function isPermissionModeId(value){return value!==void 0&&PERMISSION_MODE_IDS.includes(value)}function describePermissionMode(permissionMode){if(permissionMode===void 0)return"\u672A\u6307\u5B9A\uFF08\u30E2\u30FC\u30C9\u306E\u65B9\u91DD\u306E\u307E\u307E\uFF09";switch(permissionMode){case"plan":return"plan\uFF08read \u306E\u307F\u8A31\u53EF\u3002write / exec \u306F\u62D2\u5426\uFF09";case"acceptEdits":return"acceptEdits\uFF08write \u306E\u78BA\u8A8D\u3092\u81EA\u52D5\u627F\u8A8D\u3002read\
|
|
7
|
+
/ exec \u306F\u30E2\u30FC\u30C9\u306E\u307E\u307E\uFF09";case"denyAll":return"denyAll\uFF08read \u3092\u542B\u3080\u5168\u30C4\u30FC\u30EB\u3092\u62D2\u5426\uFF09";default:{const exhaustive=permissionMode;return`${String(exhaustive)}\uFF08\u4E0D\u660E\u306A\u5024\u3002\u5B89\u5168\u5074\u3067\u5168\u62D2\u5426\uFF09`}}}function applyPermissionMode(decision,risk,permissionMode){if(permissionMode===void 0)return{decision,reason:null};if(decision==="deny")return{decision,reason:null};switch(permissionMode){case"\
|
|
8
|
+
denyAll":return{decision:"deny",reason:"permission-mode=denyAll\uFF08\u5168\u30C4\u30FC\u30EB\u3092\u62D2\u5426\uFF09"};case"plan":if(risk==="read")return{decision,reason:null};return{decision:"deny",reason:`permission-mode=plan\uFF08${risk} \u30C4\u30FC\u30EB\u3092\u62D2\u5426\uFF09`};case"acceptEdits":if(risk==="write"&&decision==="ask"){return{decision:"allow",reason:"permission-mode=acceptEdits\uFF08write \u3092\u81EA\u52D5\u627F\u8A8D\uFF09"}}return{decision,reason:null};default:return{decision:"\
|
|
9
|
+
deny",reason:"\u4E0D\u660E\u306A permission-mode\uFF08\u5B89\u5168\u5074\u3067\u62D2\u5426\uFF09"}}}export{isModeId,getMode,nextMode,checkPermission,isPermissionModeId,describePermissionMode,applyPermissionMode};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createRequire as __twpCreateRequire } from 'node:module';
|
|
2
2
|
const require = __twpCreateRequire(import.meta.url);
|
|
3
|
-
import{isForceOnly,killProcessTree,system32}from"./chunk-N2UVRM3Z.js";import{applyPermissionMode,checkPermission}from"./chunk-
|
|
3
|
+
import{isForceOnly,killProcessTree,system32}from"./chunk-N2UVRM3Z.js";import{applyPermissionMode,checkPermission}from"./chunk-4WK2ECUX.js";import{DEFAULT_MAX_TOKENS,emptyUsage}from"./chunk-RQFG3OUL.js";import{findExecutable,isWindowsDriveAbsolute}from"./chunk-PMOUHEJQ.js";import{configReadDirs,ensureTwpHome,twpHomeDir}from"./chunk-RZVI6PMW.js";import{sep as sep2}from"path";import{realpathSync}from"fs";import{homedir}from"os";import{dirname,isAbsolute,relative,resolve,sep}from"path";var PathDeniedError=class extends Error{constructor(message){super(message);this.name="PathDeniedError"}};function resolveToolPath(input,cwd,home=homedir()){if(typeof input!=="string"||input.trim()===""){throw new PathDeniedError("path must be a non-empty string")}const expanded=expandHome(input,home);const abs=isAbsolute(expanded)?resolve(expanded):resolve(cwd,expanded);const root=realOrSelf(resolve(cwd));assertInside(abs,resolve(cwd),abs);assertNotSecret(abs,home);const real=realOrSelf(abs);if(real!==
|
|
4
4
|
abs){assertInside(real,root,abs);assertNotSecret(real,home)}return abs}function realToolPath(input,cwd,home=homedir()){return realOrSelf(resolveToolPath(input,cwd,home))}function assertInside(target,root,reported){const rel=relative(root,target);const outside=rel===".."||rel.startsWith(`..${sep}`)||isAbsolute(rel);if(outside){throw new PathDeniedError(`path escapes the working directory (${reported}). Only paths under ${root} can be accessed.`)}}function realOrSelf(target){let current=target;const rest=[];
|
|
5
5
|
for(;;){try{const real=realpathSync(current);return rest.length===0?real:resolve(real,...rest.reverse())}catch{const parent=dirname(current);if(parent===current)return target;rest.push(current.slice(parent.length+1));current=parent}}}function assertNotSecret(absPath,home=homedir(),env=process.env){const reason=secretReason(absPath,home,env);if(reason!==null)throw new PathDeniedError(`refusing to access ${absPath}: ${reason}`)}function secretReason(absPath,_home=homedir(),env=process.env){const lower=absPath.
|
|
6
6
|
toLowerCase();const segments=lower.split(sep);const base=segments[segments.length-1]??"";const parent=segments[segments.length-2]??"";if(base===".env"||base.startsWith(".env."))return".env files are denied (design \xA77)";if(segments.includes(".ssh"))return"SSH key material is denied (design \xA77)";if(parent===".git"&&base==="config"){return".git/config is denied (it can hold a GitHub token in the remote URL)"}if(base===".netrc"||base==="_netrc"||base===".npmrc")return"credential files are deni\
|
|
@@ -15,16 +15,16 @@ const segments=absolute.toLowerCase().split(sep2);const base=segments[segments.l
|
|
|
15
15
|
\u3080\u305F\u3081\u3001\u6BCE\u56DE\u78BA\u8A8D\u3057\u307E\u3059";if(segments.includes(".husky")||segments.includes(".githooks")){return"git hook \u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306A\u306E\u3067\u3001\u6BCE\u56DE\u78BA\u8A8D\u3057\u307E\u3059"}if(base==="package.json"||base==="makefile"||base===".envrc"||base===".mcp.json"){return`${base} \u306F\u5F8C\u7D9A\u306E\u5B9F\u884C\u306B\u5F71\u97FF\u3059\u308B\u305F\u3081\u3001\u6BCE\u56DE\u78BA\u8A8D\u3057\u307E\u3059`}return null}function validateInput(schema,input){const errors=[];if(typeof input!=="object"||input===null||Array.isArray(input)){return{ok:false,errors:["input must be a JSON object"],value:{}}}const value={...input};const props=schema.properties??{};for(const key of schema.required??[]){if(value[key]===void 0||value[key]===null)errors.push(`missing required property: ${key}`)}if(schema.additionalProperties===false){for(const key of Object.keys(value)){if(!(key in props))errors.push(`unknown property: ${key}`)}}
|
|
16
16
|
for(const[key,sub]of Object.entries(props)){if(value[key]===void 0){if(sub.default!==void 0)value[key]=sub.default;continue}checkValue(`${key}`,sub,value[key],errors)}return{ok:errors.length===0,errors,value}}function checkValue(path4,schema,value,errors){switch(schema.type){case"string":if(typeof value!=="string")errors.push(`${path4} must be a string`);break;case"boolean":if(typeof value!=="boolean")errors.push(`${path4} must be a boolean`);break;case"integer":if(typeof value!=="number"||!Number.
|
|
17
17
|
isInteger(value))errors.push(`${path4} must be an integer`);break;case"number":if(typeof value!=="number"||!Number.isFinite(value))errors.push(`${path4} must be a number`);break;case"array":if(!Array.isArray(value)){errors.push(`${path4} must be an array`);break}if(schema.items){value.forEach((item,i)=>checkValue(`${path4}[${i}]`,schema.items,item,errors))}break;case"object":if(typeof value!=="object"||value===null||Array.isArray(value)){errors.push(`${path4} must be an object`)}break;default:break}
|
|
18
|
-
if(schema.enum&&!schema.enum.some(v=>v===value)){errors.push(`${path4} must be one of: ${schema.enum.join(", ")}`)}if(typeof value==="number"){if(schema.minimum!==void 0&&value<schema.minimum)errors.push(`${path4} must be >= ${schema.minimum}`);if(schema.maximum!==void 0&&value>schema.maximum)errors.push(`${path4} must be <= ${schema.maximum}`)}}async function executeTool(tool,rawInput,deps){const validated=validateInput(tool.inputSchema,rawInput);if(!validated.ok){const content=`Invalid input for ${tool.name}:
|
|
19
|
-
- ${validated.errors.join("\n- ")}`;deps.audit.record({event:"result",tool:tool.name,risk:tool.risk,outcome:"error",bytes:Buffer.byteLength(content),mode:deps.mode.id,reasonCode:"invalid_input"});return{content,isError:true,summary:`${tool.name} \xB7 \u5165\u529B\u304C\u4E0D\u6B63`}}const input=validated.value;const recordDecision=(decision,reasonCode,reason)=>{deps.audit.record({event:"decision",tool:tool.name,risk:tool.risk,decision,reasonCode,reason,mode:deps.mode.id,rawInput:input})};
|
|
20
|
-
tool.name,deps.mode);const overlay=applyPermissionMode(modePolicy,tool.risk,deps.permissionMode);const policy=overlay.decision;if(policy==="deny"){recordDecision("deny",overlay.reason===null?"mode_policy":"permission_mode",overlay.reason??`mode=${deps.mode.id} \u306E\u65B9\u91DD`);return{content:overlay.reason===null?`permission denied: ${tool.name} is not available in ${deps.mode.id} mode.`:`permission denied: ${tool.name} is blocked by --permission-mode=${deps.
|
|
21
|
-
denied:true,summary:overlay.reason===null?`${tool.name} \xB7 deny\uFF08${deps.mode.label}\u30E2\u30FC\u30C9\uFF09`:`${tool.name} \xB7 deny\uFF08--permission-mode=${deps.permissionMode??""}\uFF09`}}const preview=safePreview(tool,input);const noAlwaysReason=neverAutoAllowReason(tool,input)??autoApproveExemptReason(tool,input,deps.ctx.cwd);const needsAsk=policy==="ask"||noAlwaysReason!==null;if(needsAsk){const skip=noAlwaysReason===null&&deps.sessionAllow.has(tool.
|
|
22
|
-
|
|
23
|
-
`)+"Explain what you would run instead of running it.",isError:true,denied:true,summary:`${tool.name} \xB7 \u975E\u5BFE\u8A71\u306E\u305F\u3081\u62D2\u5426`}}let diff;try{diff=await tool.prepare?.(input,deps.ctx)??void 0}catch(err){diff=void 0;if(err instanceof PathDeniedError){recordDecision("deny","path_denied","\u4FDD\u8B77\u3055\u308C\u305F\u30D1\u30B9\uFF08paths.ts\uFF09");return{content:err.message,isError:true,denied:true,summary:`${tool.name} \xB7 deny\uFF08\u4FDD\u8B77\u3055\
|
|
24
|
-
const answer=await deps.askPermission({tool,input,preview,...diff?{diff}:{},noAlwaysReason});if(answer==="no"){recordDecision("deny","user_declined","\u5229\u7528\u8005\u304C\u62D2\u5426");return{content:`permission denied: the user declined to run ${tool.name}.`,isError:true,denied:true,summary:`${tool.name} \xB7 \u5229\u7528\u8005\u304C\u62D2\u5426`}}if(answer==="always"&&noAlwaysReason===null)deps.sessionAllow.add(tool.name);recordDecision("allow","
|
|
25
|
-
\u304B\u306A\u3044\uFF09":"\u5229\u7528\u8005\u304C\u627F\u8A8D")}}else{recordDecision("allow",overlay.reason===null?"mode_policy":"permission_mode",overlay.reason??`mode=${deps.mode.id} \u306E\u65B9\u91DD`)}deps.onStart?.(tool,preview);try{const result=await tool.run(input,deps.ctx);deps.audit.record({event:"result",tool:tool.name,risk:tool.risk,outcome:result.isError===true?"error":"ok",bytes:Buffer.byteLength(
|
|
26
|
-
PathDeniedError){deps.audit.record({event:"result",tool:tool.name,risk:tool.risk,outcome:"denied",bytes:Buffer.byteLength(err.message),mode:deps.mode.id,reasonCode:"path_denied"});return{content:err.message,isError:true,denied:true,summary:`${tool.name} \xB7 deny\uFF08\u4FDD\u8B77\u3055\u308C\u305F\u30D1\u30B9\uFF09`}}const message=`${tool.name} failed: ${err.message}`;deps.audit.record(
|
|
27
|
-
id});return{content:message,isError:true,summary:`${tool.name} \xB7 \u30A8\u30E9\u30FC`}}}function safePreview(tool,input){try{return tool.preview(input)}catch{return tool.name}}function toWireTool(def){return{name:def.name,description:def.description,input_schema:def.inputSchema}}var DEFAULT_MAX_STEPS=24;function buildSystemPrompt(ctx){const tools=ctx.toolNames??[];const capability=tools.length===0?["- **\u30C4\u30FC\u30EB\u5B9F\u884C\u306F\u307E\u3060\u5229\u7528\u3067\u304D\u307E\u305B\u3093\u3002** \u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u307F\u66F8\u304D\u30FB\u30B3\u30DE\u30F3\u30C9\u5B9F\u884C\u30FBTWP API \u64CD\u4F5C\u30FBWeb \u691C\u7D22\u306F\u3044\u305A\u308C\u3082\u884C\u3048\u307E\u305B\u3093","- \u5B9F\u884C\u304C\u5FC5\u8981\u306A\u3053\u3068\u306F\u3001\u5229\u7528\u8005\u304C\u81EA\u5206\u3067\u5B9F\u884C\u3067\u304D\u308B\u30B3\u30DE\u30F3\u30C9\u3084\u624B\u9806\u3068\u3057\u3066\u63D0\u793A\u3057\u3066\u304F\u3060\u3055\u3044"]:
|
|
18
|
+
if(schema.enum&&!schema.enum.some(v=>v===value)){errors.push(`${path4} must be one of: ${schema.enum.join(", ")}`)}if(typeof value==="number"){if(schema.minimum!==void 0&&value<schema.minimum)errors.push(`${path4} must be >= ${schema.minimum}`);if(schema.maximum!==void 0&&value>schema.maximum)errors.push(`${path4} must be <= ${schema.maximum}`)}}async function executeTool(tool,rawInput,deps,callId){const validated=validateInput(tool.inputSchema,rawInput);if(!validated.ok){const content=`Invalid input for ${tool.name}:
|
|
19
|
+
- ${validated.errors.join("\n- ")}`;deps.audit.record({event:"result",tool:tool.name,risk:tool.risk,outcome:"error",bytes:Buffer.byteLength(content),mode:deps.mode.id,reasonCode:"invalid_input",callId});return{content,isError:true,summary:`${tool.name} \xB7 \u5165\u529B\u304C\u4E0D\u6B63`}}const input=validated.value;const recordDecision=(decision,reasonCode,reason)=>{deps.audit.record({event:"decision",tool:tool.name,risk:tool.risk,decision,reasonCode,reason,mode:deps.mode.id,rawInput:input,callId})};
|
|
20
|
+
const modePolicy=checkPermission(tool.name,deps.mode);const overlay=applyPermissionMode(modePolicy,tool.risk,deps.permissionMode);const policy=overlay.decision;if(policy==="deny"){recordDecision("deny",overlay.reason===null?"mode_policy":"permission_mode",overlay.reason??`mode=${deps.mode.id} \u306E\u65B9\u91DD`);return{content:overlay.reason===null?`permission denied: ${tool.name} is not available in ${deps.mode.id} mode.`:`permission denied: ${tool.name} is blocked by --permission-mode=${deps.
|
|
21
|
+
permissionMode??""}.`,isError:true,denied:true,summary:overlay.reason===null?`${tool.name} \xB7 deny\uFF08${deps.mode.label}\u30E2\u30FC\u30C9\uFF09`:`${tool.name} \xB7 deny\uFF08--permission-mode=${deps.permissionMode??""}\uFF09`}}const preview=safePreview(tool,input);const noAlwaysReason=neverAutoAllowReason(tool,input)??autoApproveExemptReason(tool,input,deps.ctx.cwd);const needsAsk=policy==="ask"||noAlwaysReason!==null;if(needsAsk){const skip=noAlwaysReason===null&&deps.sessionAllow.has(tool.
|
|
22
|
+
name);if(skip)recordDecision("allow","session_allow","\u30BB\u30C3\u30B7\u30E7\u30F3\u5185\u306E\u300C\u4ECA\u5F8C\u805E\u304B\u306A\u3044\u300D");if(!skip){if(!deps.askPermission){recordDecision("deny",noAlwaysReason===null?"non_interactive":"guard",noAlwaysReason??"\u975E\u5BFE\u8A71\u30BB\u30C3\u30B7\u30E7\u30F3\u3067\u627F\u8A8D\u304C\u5FC5\u8981\uFF08deny-and-continue\uFF09");return{content:`permission denied: ${tool.name} requires approval, and this session is non-interactive. `+(noAlwaysReason===
|
|
23
|
+
null?"":`Reason: ${noAlwaysReason} `)+"Explain what you would run instead of running it.",isError:true,denied:true,summary:`${tool.name} \xB7 \u975E\u5BFE\u8A71\u306E\u305F\u3081\u62D2\u5426`}}let diff;try{diff=await tool.prepare?.(input,deps.ctx)??void 0}catch(err){diff=void 0;if(err instanceof PathDeniedError){recordDecision("deny","path_denied","\u4FDD\u8B77\u3055\u308C\u305F\u30D1\u30B9\uFF08paths.ts\uFF09");return{content:err.message,isError:true,denied:true,summary:`${tool.name} \xB7 deny\uFF08\u4FDD\u8B77\u3055\
|
|
24
|
+
\u308C\u305F\u30D1\u30B9\uFF09`}}}const answer=await deps.askPermission({tool,input,preview,...diff?{diff}:{},noAlwaysReason});if(answer==="no"){recordDecision("deny","user_declined","\u5229\u7528\u8005\u304C\u62D2\u5426");return{content:`permission denied: the user declined to run ${tool.name}.`,isError:true,denied:true,summary:`${tool.name} \xB7 \u5229\u7528\u8005\u304C\u62D2\u5426`}}if(answer==="always"&&noAlwaysReason===null)deps.sessionAllow.add(tool.name);recordDecision("allow","user_appro\
|
|
25
|
+
ved",answer==="always"?"\u5229\u7528\u8005\u304C\u627F\u8A8D\uFF08\u4ECA\u5F8C\u805E\u304B\u306A\u3044\uFF09":"\u5229\u7528\u8005\u304C\u627F\u8A8D")}}else{recordDecision("allow",overlay.reason===null?"mode_policy":"permission_mode",overlay.reason??`mode=${deps.mode.id} \u306E\u65B9\u91DD`)}deps.onStart?.(tool,preview);try{const result=await tool.run(input,deps.ctx);deps.audit.record({event:"result",tool:tool.name,risk:tool.risk,outcome:result.isError===true?"error":"ok",bytes:Buffer.byteLength(
|
|
26
|
+
result.content),mode:deps.mode.id,callId});return{summary:preview,...result}}catch(err){if(err instanceof PathDeniedError){deps.audit.record({event:"result",tool:tool.name,risk:tool.risk,outcome:"denied",bytes:Buffer.byteLength(err.message),mode:deps.mode.id,reasonCode:"path_denied",callId});return{content:err.message,isError:true,denied:true,summary:`${tool.name} \xB7 deny\uFF08\u4FDD\u8B77\u3055\u308C\u305F\u30D1\u30B9\uFF09`}}const message=`${tool.name} failed: ${err.message}`;deps.audit.record(
|
|
27
|
+
{event:"result",tool:tool.name,risk:tool.risk,outcome:"error",bytes:Buffer.byteLength(message),mode:deps.mode.id,callId});return{content:message,isError:true,summary:`${tool.name} \xB7 \u30A8\u30E9\u30FC`}}}function safePreview(tool,input){try{return tool.preview(input)}catch{return tool.name}}function toWireTool(def){return{name:def.name,description:def.description,input_schema:def.inputSchema}}var DEFAULT_MAX_STEPS=24;function buildSystemPrompt(ctx){const tools=ctx.toolNames??[];const capability=tools.length===0?["- **\u30C4\u30FC\u30EB\u5B9F\u884C\u306F\u307E\u3060\u5229\u7528\u3067\u304D\u307E\u305B\u3093\u3002** \u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u307F\u66F8\u304D\u30FB\u30B3\u30DE\u30F3\u30C9\u5B9F\u884C\u30FBTWP API \u64CD\u4F5C\u30FBWeb \u691C\u7D22\u306F\u3044\u305A\u308C\u3082\u884C\u3048\u307E\u305B\u3093","- \u5B9F\u884C\u304C\u5FC5\u8981\u306A\u3053\u3068\u306F\u3001\u5229\u7528\u8005\u304C\u81EA\u5206\u3067\u5B9F\u884C\u3067\u304D\u308B\u30B3\u30DE\u30F3\u30C9\u3084\u624B\u9806\u3068\u3057\u3066\u63D0\u793A\u3057\u3066\u304F\u3060\u3055\u3044"]:
|
|
28
28
|
[`- \u4F7F\u3048\u308B\u30C4\u30FC\u30EB: ${tools.join(" / ")}`,"- **\u63A8\u6E2C\u3067\u7B54\u3048\u305A\u3001\u307E\u305A\u30C4\u30FC\u30EB\u3067\u78BA\u304B\u3081\u3066\u304F\u3060\u3055\u3044\u3002** \u30D5\u30A1\u30A4\u30EB\u306E\u5185\u5BB9\u30FB\u30B3\u30DE\u30F3\u30C9\u306E\u7D50\u679C\u30FB\u73FE\u5728\u306E\u72B6\u614B\u306F\u3059\u3079\u3066\u5B9F\u969B\u306B\u8AAD\u3093\u3067\u304B\u3089\u7B54\u3048\u307E\u3059","- \u4E00\u5EA6\u306B1\u3064\u305A\u3064\u78BA\u304B\u3081\u3001\u7D50\u679C\u3092\u898B\u3066\u304B\u3089\u6B21\u3092\u6C7A\u3081\u3066\u304F\u3060\u3055\u3044",
|
|
29
29
|
"- \u30C4\u30FC\u30EB\u304C\u62D2\u5426\u3055\u308C\u305F\uFF08permission denied\uFF09\u3068\u304D\u306F\u3001\u540C\u3058\u547C\u3073\u51FA\u3057\u3092\u7E70\u308A\u8FD4\u3055\u305A\u3001\u4F55\u3092\u3057\u305F\u3044\u306E\u304B\u3092\u5229\u7528\u8005\u306B\u8AAC\u660E\u3057\u3066\u304F\u3060\u3055\u3044"];return[`\u3042\u306A\u305F\u306F TWP\uFF08Tocca Working Platform\uFF09\u306E CLI\u300Ctwp\u300D${ctx.cliVersion} \u306E\u4E2D\u3067\u52D5\u304F\u30A2\u30B7\u30B9\u30BF\u30F3\u30C8\u3067\u3059\u3002`,
|
|
30
30
|
"\u51FA\u529B\u306F\u7AEF\u672B\u306B\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u65E5\u672C\u8A9E\u3067\u3001\u7D50\u8AD6\u3092\u5148\u306B\u3001\u7C21\u6F54\u306B\u7B54\u3048\u3066\u304F\u3060\u3055\u3044\u3002","","## \u3044\u307E\u3067\u304D\u308B\u3053\u3068\u30FB\u3067\u304D\u306A\u3044\u3053\u3068","",...capability,"- \u898B\u3066\u3044\u306A\u3044\u30D5\u30A1\u30A4\u30EB\u306E\u5185\u5BB9\u3084\u5B9F\u884C\u3057\u3066\u3044\u306A\u3044\u30B3\u30DE\u30F3\u30C9\u306E\u7D50\u679C\u3092\u3001\u898B\u305F\u30FB\u5B9F\u884C\u3057\u305F\u304B\u306E\u3088\u3046\u306B\u66F8\u304B\u306A\u3044\u3067\u304F\u3060\u3055\u3044",
|
|
@@ -33,28 +33,29 @@ tools??[];const wire=tools.map(toWireTool);context.addUser(request.input);let dr
|
|
|
33
33
|
completeTurn("");err.usage=totals;throw err}add(totals,outcome.usage);context.applyUsage(outcome.usage);lastText=outcome.text;if(outcome.aborted||outcome.upstreamError!==null||outcome.toolUses.length===0){const kept=context.completeTurn(outcome.text);return{text:outcome.text,usage:totals,aborted:outcome.aborted,upstreamError:outcome.upstreamError,stopReason:outcome.stopReason,droppedMessages,emptyResponse:!kept,toolCalls,maxStepsReached:false}}const results=await runToolUses(outcome.toolUses,tools,
|
|
34
34
|
request);toolCalls+=results.length;context.addToolExchange(outcome.text,outcome.toolUses,results);if(request.signal?.aborted===true){return{text:outcome.text,usage:totals,aborted:true,upstreamError:null,stopReason:outcome.stopReason,droppedMessages,emptyResponse:false,toolCalls,maxStepsReached:false}}droppedMessages+=context.trimToFit(maxTokens)}return{text:lastText,usage:totals,aborted:false,upstreamError:null,stopReason:"max_steps",droppedMessages,emptyResponse:false,toolCalls,maxStepsReached:true}}
|
|
35
35
|
async function runToolUses(toolUses,tools,request){const results=[];for(const call of toolUses){request.onToolUse?.({name:call.name,input:call.input});const result=await runOne(call,tools,request);request.onToolResult?.({name:call.name,input:call.input},result);results.push({type:"tool_result",tool_use_id:call.id,content:result.content===""?"(no output)":result.content,...result.isError===true?{is_error:true}:{}})}return results}async function runOne(call,tools,request){const auditUnexecuted=(reasonCode,reason)=>{
|
|
36
|
-
if(!request.execute)return;request.execute.audit.record({event:"decision",tool:call.name,risk:"unknown",decision:"deny",reasonCode,reason,mode:request.execute.mode.id,rawInput:typeof call.input==="object"&&call.input!==null?call.input:{}})};if(request.signal?.aborted===true){auditUnexecuted("interrupted","\u5229\u7528\u8005\u304C\u4E2D\u65AD\u3057\u305F\u305F\u3081\u5B9F\u884C\u3057\u306A\u3044");return{content:"interrupted by the user before this tool ran",isError:true,summary:`${call.
|
|
37
|
-
\u65AD`}}const tool=tools.find(t=>t.name===call.name);if(!tool){auditUnexecuted("unknown_tool","\u30E2\u30C7\u30EB\u306B\u6E21\u3057\u3066\u3044\u306A\u3044\u30C4\u30FC\u30EB\u540D\uFF08\u5E38\u99D0\u30BB\u30C3\u30C8\u306B\u7121\u3044\uFF09");return{content:`Unknown tool: ${call.name}. Available tools: ${tools.map(t=>t.name).join(", ")||"(none)"}`,isError:true,summary:`${call.name} \xB7 \u672A\u77E5\u306E\u30C4\u30FC\u30EB`}}if(!request.execute){return{content:`Tool ${call.name}
|
|
38
|
-
session has no tool execution context.`,isError:true,summary:`${call.name} \xB7 \u5B9F\u884C\u74B0\u5883\u306A\u3057`}}return executeTool(tool,call.input,{...request.execute,ctx:{...request.execute.ctx,...request.signal?{signal:request.signal}:{}}})}function add(target,source){target.inputTokens+=source.inputTokens;target.cacheReadTokens+=source.cacheReadTokens;target.cacheWriteTokens+=source.cacheWriteTokens;target.outputTokens+=source.outputTokens}import fs from"fs";import path from"path";import crypto from"crypto";var MAX_LINE_BYTES=4096;var MAX_FILE_BYTES=5*1024*1024;var MAX_AGE_DAYS=14;var MAX_FILES=200;var PRUNE_GRACE_MS=6*60*60*1e3;var MAX_STRING_BYTES=200;var MAX_TOOL_NAME_BYTES=120;var REDACT_KEYS=new Set(["content","contents","new_string","old_string","body","text","patch","diff","data","stdin","password","passwd","pwd","secret","secret_key","token","access_token","refresh_token","id_token","session_token","api_key","apikey","api-key","key","private_key","client_secret","
|
|
39
|
-
|
|
40
|
-
var TOKEN_RE=/[^\s=:,;&|<>'"`()[\]{}/\\]+/g;var SEPARATOR_RE=/[\s=:,;&|<>'"`()[\]{}/\\]/;var SecretRegistry=class _SecretRegistry{static MAX_HASHES=4096;static MAX_PHRASES=64;static MIN_LENGTH=12;static MAX_LENGTH=512;hashes=new Set;phrases=[];saturated=false;learn(value,depth=0){if(value!==null&&typeof value==="object"&&depth<8){const children=Array.isArray(value)?value:Object.values(value);for(const child of children)this.learn(child,depth+1);return}const text=typeof value===
|
|
41
|
-
value);if(text==="")return;for(const line of text.split(/\r?\n/)){const trimmed=line.trim();if(trimmed==="")continue;const eq=trimmed.indexOf("=");if(eq>0)this.add(unquote(trimmed.slice(eq+1).trim()),true);if(!/\s/.test(trimmed))this.add(unquote(trimmed),false)}}add(candidate,fromEnv){if(candidate.length<_SecretRegistry.MIN_LENGTH)return;if(candidate.length>_SecretRegistry.MAX_LENGTH)return;const hasSeparator=SEPARATOR_RE.test(candidate);if(hasSeparator&&!fromEnv)return;
|
|
42
|
-
phrases.includes(candidate))return;if(this.phrases.length>=_SecretRegistry.MAX_PHRASES){this.saturated=true;return}this.phrases.push(candidate);return}const hash=digest(candidate);if(this.hashes.has(hash))return;if(this.hashes.size>=_SecretRegistry.MAX_HASHES){this.saturated=true;return}this.hashes.add(hash)}scrub(text){let out=text;for(const phrase of this.phrases){if(out.includes(phrase))out=out.split(phrase).join("[REDACTED]")}if(this.hashes.size===0)return out;return out.
|
|
43
|
-
length>=_SecretRegistry.MIN_LENGTH&&this.hashes.has(digest(token))?"[REDACTED]":token)}};function digest(value){return crypto.createHash("sha256").update(value,"utf8").digest("hex").slice(0,24)}function unquote(value){const first=value[0];if((first==='"'||first==="'")&&value.endsWith(first)&&value.length>1)return value.slice(1,-1);return value}function safeStringify(value){try{return JSON.stringify(value)??""}catch{return""}}function
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
36
|
+
if(!request.execute)return;request.execute.audit.record({event:"decision",tool:call.name,risk:"unknown",decision:"deny",reasonCode,reason,mode:request.execute.mode.id,rawInput:typeof call.input==="object"&&call.input!==null?call.input:{},callId:call.id})};if(request.signal?.aborted===true){auditUnexecuted("interrupted","\u5229\u7528\u8005\u304C\u4E2D\u65AD\u3057\u305F\u305F\u3081\u5B9F\u884C\u3057\u306A\u3044");return{content:"interrupted by the user before this tool ran",isError:true,summary:`${call.
|
|
37
|
+
name} \xB7 \u4E2D\u65AD`}}const tool=tools.find(t=>t.name===call.name);if(!tool){auditUnexecuted("unknown_tool","\u30E2\u30C7\u30EB\u306B\u6E21\u3057\u3066\u3044\u306A\u3044\u30C4\u30FC\u30EB\u540D\uFF08\u5E38\u99D0\u30BB\u30C3\u30C8\u306B\u7121\u3044\uFF09");return{content:`Unknown tool: ${call.name}. Available tools: ${tools.map(t=>t.name).join(", ")||"(none)"}`,isError:true,summary:`${call.name} \xB7 \u672A\u77E5\u306E\u30C4\u30FC\u30EB`}}if(!request.execute){return{content:`Tool ${call.name}\
|
|
38
|
+
cannot run: this session has no tool execution context.`,isError:true,summary:`${call.name} \xB7 \u5B9F\u884C\u74B0\u5883\u306A\u3057`}}return executeTool(tool,call.input,{...request.execute,ctx:{...request.execute.ctx,...request.signal?{signal:request.signal}:{}}},call.id)}function add(target,source){target.inputTokens+=source.inputTokens;target.cacheReadTokens+=source.cacheReadTokens;target.cacheWriteTokens+=source.cacheWriteTokens;target.outputTokens+=source.outputTokens}import fs from"fs";import path from"path";import crypto from"crypto";var MAX_LINE_BYTES=4096;var MAX_FILE_BYTES=5*1024*1024;var MAX_CALL_ID_BYTES=64;var MAX_AGE_DAYS=14;var MAX_FILES=200;var PRUNE_GRACE_MS=6*60*60*1e3;var MAX_STRING_BYTES=200;var MAX_TOOL_NAME_BYTES=120;var REDACT_KEYS=new Set(["content","contents","new_string","old_string","body","text","patch","diff","data","stdin","password","passwd","pwd","secret","secret_key","token","access_token","refresh_token","id_token","session_token","api_key","apikey","api-key","key","private_key","client_secret","au\
|
|
39
|
+
thorization","auth","cookie","headers","signature","credential","credentials"]);var SECRET_PATTERNS=[/(?:bearer|basic)\s+[A-Za-z0-9._~+/=-]{8,}/gi,/\b(?:sk|pk|rk)-[A-Za-z0-9_-]{8,}/g,/\bgh[pousr]_[A-Za-z0-9]{8,}/g,/\bAKIA[0-9A-Z]{12,}/g,/-----BEGIN[^-]*PRIVATE KEY-----/g,/\b(?:password|passwd|pwd|token|secret|api[_-]?key)\s*[:=]\s*[^\s;&|<>'"`]+/gi,/\b[A-Fa-f0-9]{40,}\b/g,/\b[A-Za-z0-9+_-]{40,}={0,2}\b/g];function scrubSecrets(value){let out=value;for(const re of SECRET_PATTERNS)out=out.replace(
|
|
40
|
+
re,"[REDACTED]");return out}var TOKEN_RE=/[^\s=:,;&|<>'"`()[\]{}/\\]+/g;var SEPARATOR_RE=/[\s=:,;&|<>'"`()[\]{}/\\]/;var SecretRegistry=class _SecretRegistry{static MAX_HASHES=4096;static MAX_PHRASES=64;static MIN_LENGTH=12;static MAX_LENGTH=512;hashes=new Set;phrases=[];saturated=false;learn(value,depth=0){if(value!==null&&typeof value==="object"&&depth<8){const children=Array.isArray(value)?value:Object.values(value);for(const child of children)this.learn(child,depth+1);return}const text=typeof value===
|
|
41
|
+
"string"?value:safeStringify(value);if(text==="")return;for(const line of text.split(/\r?\n/)){const trimmed=line.trim();if(trimmed==="")continue;const eq=trimmed.indexOf("=");if(eq>0)this.add(unquote(trimmed.slice(eq+1).trim()),true);if(!/\s/.test(trimmed))this.add(unquote(trimmed),false)}}add(candidate,fromEnv){if(candidate.length<_SecretRegistry.MIN_LENGTH)return;if(candidate.length>_SecretRegistry.MAX_LENGTH)return;const hasSeparator=SEPARATOR_RE.test(candidate);if(hasSeparator&&!fromEnv)return;
|
|
42
|
+
if(hasSeparator){if(this.phrases.includes(candidate))return;if(this.phrases.length>=_SecretRegistry.MAX_PHRASES){this.saturated=true;return}this.phrases.push(candidate);return}const hash=digest(candidate);if(this.hashes.has(hash))return;if(this.hashes.size>=_SecretRegistry.MAX_HASHES){this.saturated=true;return}this.hashes.add(hash)}scrub(text){let out=text;for(const phrase of this.phrases){if(out.includes(phrase))out=out.split(phrase).join("[REDACTED]")}if(this.hashes.size===0)return out;return out.
|
|
43
|
+
replace(TOKEN_RE,token=>token.length>=_SecretRegistry.MIN_LENGTH&&this.hashes.has(digest(token))?"[REDACTED]":token)}};function digest(value){return crypto.createHash("sha256").update(value,"utf8").digest("hex").slice(0,24)}function unquote(value){const first=value[0];if((first==='"'||first==="'")&&value.endsWith(first)&&value.length>1)return value.slice(1,-1);return value}function safeStringify(value){try{return JSON.stringify(value)??""}catch{return""}}function sanitizeEvent(event,registry){if(event.
|
|
44
|
+
event!=="decision")return event;const{rawInput,...rest}=event;return{...rest,input:sanitizeInput(rawInput,registry)}}function describeAuditLog(logger){if(logger.path===null)return"\u7121\u52B9\uFF08TWP_NO_AUDIT=1\uFF09";if(!logger.opened)return`${logger.path}\uFF08\u672A\u4F5C\u6210\u30FB\u6700\u521D\u306E\u30C4\u30FC\u30EB\u5B9F\u884C\u3067\u4F5C\u308B\uFF09`;return logger.path}function nullAuditLogger(){return{path:null,sessionId:"",opened:false,record:()=>void 0,close:()=>void 0}}function createAuditLogger(ctx){
|
|
45
|
+
const env=ctx.env??process.env;if(env.TWP_NO_AUDIT==="1")return nullAuditLogger();const sessionId=newSessionId();const file=path.join(twpHomeDir(env),"logs",`session-${sessionId}.jsonl`);let fd=null;let everOpened=false;let written=0;let stopped=false;const registry=new SecretRegistry;let reportedSaturation=false;const open=()=>{if(fd!==null)return true;if(stopped)return false;try{const dir=path.join(ensureTwpHome(env),"logs");const link=lstatOrNull(dir);if(link!==null&&link.isSymbolicLink()){stopped=
|
|
46
|
+
true;return false}fs.mkdirSync(dir,{recursive:true,mode:448});if(process.platform!=="win32"){try{fs.chmodSync(dir,448)}catch{}}prune(dir);const handle=fs.openSync(file,"a",384);if(process.platform!=="win32"){try{fs.fchmodSync(handle,384)}catch{fs.closeSync(handle);try{fs.unlinkSync(file)}catch{}stopped=true;return false}}fd=handle;everOpened=true;ctx.onOpen?.(file);return true}catch{stopped=true;return false}};const writeAll=(handle,text)=>{const buf=Buffer.from(text,"utf8");let offset=0;while(offset<
|
|
47
|
+
buf.length){const n=fs.writeSync(handle,buf,offset,buf.length-offset);if(n<=0)throw new Error("writeSync made no progress");offset+=n}written+=buf.length};const writeLine=payload=>{if(stopped||!open()||fd===null)return;try{let line=`${JSON.stringify(payload)}
|
|
47
48
|
`;if(Buffer.byteLength(line)>MAX_LINE_BYTES&&"input"in payload){const rest={...payload};delete rest["input"];line=`${JSON.stringify({...rest,_dropped:"line_too_long"})}
|
|
48
49
|
`}if(Buffer.byteLength(line)>MAX_LINE_BYTES){line=`${JSON.stringify({ts:now(),v:1,session:sessionId,event:payload["event"],tool:clamp(String(payload["tool"]??""),40),_dropped:"line_too_long"})}
|
|
49
50
|
`}if(written+Buffer.byteLength(line)>MAX_FILE_BYTES){stopped=true;writeAll(fd,`${JSON.stringify({ts:now(),v:1,session:sessionId,event:"truncated"})}
|
|
50
51
|
`);return}writeAll(fd,line)}catch{stopped=true}};const common={v:1,session:sessionId,permission_mode:ctx.permissionMode??null};let wroteHeader=false;const header=()=>{if(wroteHeader)return;writeLine({ts:now(),...common,event:"session_start",mode:ctx.mode,model:ctx.model,cwd:ctx.cwd,cli_version:ctx.cliVersion,interactive:ctx.interactive,pid:process.pid});if(fd!==null&&!stopped)wroteHeader=true};const reportSaturation=()=>{if(!registry.saturated||reportedSaturation)return;reportedSaturation=true;writeLine(
|
|
51
|
-
{ts:now(),...common,event:"registry_saturated"})};return{path:file,sessionId,record(event){header();const tool=clamp(
|
|
52
|
-
outcome,bytes:
|
|
53
|
-
learnSecrets(rawInput,0,registry);return sanitizeObject(rawInput,0,registry)}function learnSecrets(value,depth,registry){if(depth>8||value===null||typeof value!=="object")return;if(Array.isArray(value)){for(const item of value)learnSecrets(item,depth+1,registry);return}for(const[key,child]of Object.
|
|
54
|
-
value]of Object.entries(obj)){if(keys>=20){out["_twp_more_keys"]=true;break}keys++;if(REDACT_KEYS.has(key.toLowerCase())){out[key]=`<redacted ${byteLengthOf(value)} bytes>`;continue}out[key]=sanitizeValue(value,depth+1,registry)}return out}function sanitizeValue(value,depth,registry){if(value===null||
|
|
55
|
-
value)){const head=value.slice(0,10).map(v=>sanitizeValue(v,depth+1,registry));return value.length>10?[...head,`\u2026(+${value.length-10})`]:head}if(typeof value==="object")return sanitizeObject(value,depth,registry);return`<${typeof value}>`}function byteLengthOf(value){if(typeof value==="
|
|
56
|
-
test(n))}catch{return}const stats=[];for(const name of entries){try{stats.push({name,mtime:fs.statSync(path.join(dir,name)).mtimeMs})}catch{}}stats.sort((a,b)=>b.mtime-a.mtime);const cutoff=nowMs-MAX_AGE_DAYS*24*60*60*1e3;stats.forEach((entry,index)=>{const overCount=index>=MAX_FILES-
|
|
57
|
-
|
|
52
|
+
{ts:now(),...common,event:"registry_saturated"})};return{path:file,sessionId,get opened(){return everOpened},record(event){header();const safe=sanitizeEvent(event,registry);const tool=clamp(safe.tool,MAX_TOOL_NAME_BYTES);const callId=safe.callId===void 0?{}:{call_id:clamp(safe.callId,MAX_CALL_ID_BYTES)};if(safe.event==="decision"){writeLine({ts:now(),...common,event:"decision",tool,...callId,risk:safe.risk,decision:safe.decision,reason_code:safe.reasonCode,reason:safe.reason,mode:safe.mode,input:safe.
|
|
53
|
+
input});reportSaturation();return}writeLine({ts:now(),...common,event:"result",tool,...callId,risk:safe.risk,outcome:safe.outcome,bytes:safe.bytes,mode:safe.mode,...safe.reasonCode!==void 0?{reason_code:safe.reasonCode}:{}})},close(){stopped=true;if(fd===null)return;try{fs.closeSync(fd)}catch{}fd=null}}}function now(){return new Date().toISOString()}function lstatOrNull(target){try{return fs.lstatSync(target)}catch{return null}}function clamp(value,maxBytes){const total=Buffer.byteLength(value);
|
|
54
|
+
if(total<=maxBytes)return value;let out=value;while(out.length>0&&Buffer.byteLength(out)>maxBytes)out=out.slice(0,-1);return`${out}\u2026(+${total-Buffer.byteLength(out)})`}function sanitizeInput(rawInput,registry){learnSecrets(rawInput,0,registry);return sanitizeObject(rawInput,0,registry)}function learnSecrets(value,depth,registry){if(depth>8||value===null||typeof value!=="object")return;if(Array.isArray(value)){for(const item of value)learnSecrets(item,depth+1,registry);return}for(const[key,child]of Object.
|
|
55
|
+
entries(value)){if(REDACT_KEYS.has(key.toLowerCase()))registry.learn(child);else learnSecrets(child,depth+1,registry)}}function sanitizeObject(obj,depth,registry){const out={};let keys=0;for(const[key,value]of Object.entries(obj)){if(keys>=20){out["_twp_more_keys"]=true;break}keys++;if(REDACT_KEYS.has(key.toLowerCase())){out[key]=`<redacted ${byteLengthOf(value)} bytes>`;continue}out[key]=sanitizeValue(value,depth+1,registry)}return out}function sanitizeValue(value,depth,registry){if(value===null||
|
|
56
|
+
typeof value==="number"||typeof value==="boolean")return value;if(typeof value==="string"){return clamp(registry.scrub(scrubSecrets(value)),MAX_STRING_BYTES)}if(depth>=3)return"<depth>";if(Array.isArray(value)){const head=value.slice(0,10).map(v=>sanitizeValue(v,depth+1,registry));return value.length>10?[...head,`\u2026(+${value.length-10})`]:head}if(typeof value==="object")return sanitizeObject(value,depth,registry);return`<${typeof value}>`}function byteLengthOf(value){if(typeof value==="strin\
|
|
57
|
+
g")return Buffer.byteLength(value);try{return Buffer.byteLength(JSON.stringify(value)??"")}catch{return 0}}function prune(dir,nowMs=Date.now()){let entries;try{entries=fs.readdirSync(dir).filter(n=>/^session-.*\.jsonl$/.test(n))}catch{return}const stats=[];for(const name of entries){try{stats.push({name,mtime:fs.statSync(path.join(dir,name)).mtimeMs})}catch{}}stats.sort((a,b)=>b.mtime-a.mtime);const cutoff=nowMs-MAX_AGE_DAYS*24*60*60*1e3;stats.forEach((entry,index)=>{const overCount=index>=MAX_FILES-
|
|
58
|
+
1;const tooOld=entry.mtime<cutoff;if(!tooOld&&!overCount)return;if(!tooOld&&nowMs-entry.mtime<PRUNE_GRACE_MS)return;try{fs.unlinkSync(path.join(dir,entry.name))}catch{}})}var CROCKFORD="0123456789ABCDEFGHJKMNPQRSTVWXYZ";function newSessionId(nowMs=Date.now()){let time="";let remaining=nowMs;for(let i=0;i<10;i++){time=`${CROCKFORD[remaining%32]??"0"}${time}`;remaining=Math.floor(remaining/32)}const bytes=crypto.randomBytes(16);let rand="";for(const byte of bytes)rand+=CROCKFORD[byte%32]??"0";return`${time}${rand}`}import{readFileSync}from"fs";import{dirname as dirname2,join,resolve as resolve2,sep as sep3}from"path";function currentBranch(cwd=process.cwd()){let dir=cwd;for(;;){const gitPath=join(dir,".git");const head=readHead(gitPath);if(head!==null)return head;const parent=dirname2(dir);if(parent===dir)return null;dir=parent}}function readHead(gitPath){let headFile=join(gitPath,"HEAD");try{const stat2=readFileSync(gitPath,"utf8");const m=/^gitdir:\s*(.+)$/m.exec(stat2);if(m?.[1])headFile=join(resolve2(dirname2(
|
|
58
59
|
gitPath),m[1].trim()),"HEAD")}catch{}try{const head=readFileSync(headFile,"utf8").trim();const ref=/^ref:\s*refs\/heads\/(.+)$/.exec(head);if(ref?.[1])return ref[1];return head.slice(0,7)}catch{return null}}function displayCwd(cwd=process.cwd(),home=process.env["HOME"]??process.env["USERPROFILE"]??""){if(!home)return cwd;const stripped=home.replace(new RegExp(`${escapeSep()}+$`),"");if(stripped==="")return cwd;const normalize=p=>process.platform==="win32"?p.toLowerCase():p;const h=normalize(stripped);
|
|
59
60
|
const c=normalize(cwd);if(c===h)return"~";if(c.startsWith(h+sep3))return`~${cwd.slice(stripped.length)}`;return cwd}function escapeSep(){return sep3==="\\"?"\\\\":sep3}import{spawn}from"child_process";function keepTailBytes(buf,maxBytes){if(buf.length<=maxBytes)return{text:buf.toString("utf8"),droppedBytes:0};const start=buf.length-maxBytes;let cut=start;while(cut<buf.length&&(buf[cut]&192)===128)cut++;return{text:buf.subarray(cut).toString("utf8"),droppedBytes:cut}}function keepHeadBytes(text,maxBytes){const buf=Buffer.from(text,"utf8");if(buf.length<=maxBytes)return{text,truncated:false};let cut=maxBytes;while(cut>0&&(buf[cut]&192)===128)cut--;return{text:buf.subarray(0,cut).toString("utf8"),
|
|
60
61
|
truncated:true}}import{existsSync}from"fs";import path2 from"path";var GIT_BASH_CANDIDATES=["C:\\Program Files\\Git\\bin\\bash.exe","C:\\Program Files (x86)\\Git\\bin\\bash.exe","C:\\Program Files\\Git\\usr\\bin\\bash.exe"];function system32Path(env,...rest){return system32(env,...rest)??path2.win32.join("C:\\Windows\\System32",...rest)}function defaultProbe(filePath){try{return existsSync(filePath)}catch{return false}}function selectShell(platform=process.platform,probe=defaultProbe,env=process.env){if(platform!=="win32"){return{toolName:"bash",command:"/bin/b\
|
|
@@ -107,4 +108,4 @@ limit"]:DEFAULT_LIMIT_LINES;const slice=lines.slice(offset-1,offset-1+limit);let
|
|
|
107
108
|
[truncated: file has ${lines.length} lines; re-read with offset/limit for the rest]`:"";if(body===""){const reason=lines.length===0?"(empty file)":`(no lines at offset ${offset}; the file has ${lines.length} lines)`;return{content:reason,summary:`read_file \xB7 ${toolRelative(ctx.cwd,abs)} (0 \u884C)`}}return{content:body+note,summary:`read_file \xB7 ${toolRelative(ctx.cwd,abs)} (${slice.length} \u884C${eol==="\r\n"?" \xB7 CRLF":""})`}}};import{mkdir,readFile as readFile4,writeFile as writeFile2}from"fs/promises";import{dirname as dirname3}from"path";var writeFileTool={name:"write_file",domain:"local",risk:"write",description:"Write the full content of a file, creating it (and parent directories) if needed. Overwrites the whole file \u2014 prefer edit_file for partial changes. The existing line ending style (LF/CRLF) is preserved.",inputSchema:{type:"object",additionalProperties:false,properties:{path:{type:"string",description:"File path, relative to the working directory"},content:{type:"string",description:"Full new content. Use \\n for li\
|
|
108
109
|
ne breaks."}},required:["path","content"]},preview(input){const content=typeof input["content"]==="string"?input["content"]:"";return`write_file \xB7 ${String(input["path"]??"")} (${content.split("\n").length} \u884C)`},async prepare(input,ctx){const abs=resolveToolPath(String(input["path"]),ctx.cwd);const before=await readFile4(abs,"utf8").catch(()=>"");return{path:toolRelative(ctx.cwd,abs),before,after:String(input["content"]??"")}},async run(input,ctx){const abs=resolveToolPath(String(input["\
|
|
109
110
|
path"]),ctx.cwd);const existing=await readFile4(abs,"utf8").catch(()=>null);const eol=existing===null?"\n":detectEol(existing);const body=applyEol(String(input["content"]),eol);await mkdir(dirname3(abs),{recursive:true});await writeFile2(abs,body,"utf8");const rel=toolRelative(ctx.cwd,abs);return{content:`Wrote ${rel} (${body.split(eol).length} lines${eol==="\r\n"?", CRLF preserved":""}).`,summary:`write_file \xB7 ${rel}`,diff:{path:rel,before:existing??"",after:String(input["content"])}}}};var RESIDENT_TOKEN_CAP=8e3;function localTools(choice=selectShell()){return[readFileTool,writeFileTool,editFileTool,createBashTool(choice),globTool,grepTool,gitTool]}function buildResidentSet(mode,opts={}){const all=opts.tools??localTools();const cap=opts.cap??RESIDENT_TOKEN_CAP;const eligible=all.filter(tool=>matchesAnyGlob(tool.name,mode.tools)&&applyPermissionMode(checkPermission(tool.name,mode),tool.risk,opts.permissionMode).decision!=="deny");const tools=[];const dropped=[];let tokens=0;for(const tool of eligible){const cost=estimateToolTokens(
|
|
110
|
-
tool);if(tokens+cost>cap){dropped.push(tool.name);continue}tools.push(tool);tokens+=cost}return{tools,wire:tools.map(toWireTool),tokens,dropped}}function estimateToolTokens(tool){return Math.ceil(JSON.stringify(toWireTool(tool)).length/4)}function matchesAnyGlob(name,patterns){return patterns.some(pattern=>globToRegExp(pattern).test(name))}function globToRegExp(pattern){const escaped=pattern.replace(/[.+?^${}()|[\]\\]/g,"\\$&").replace(/\*/g,".*");return new RegExp(`^${escaped}$`)}export{buildSystemPrompt,runTurn,createAuditLogger,currentBranch,displayCwd,RESIDENT_TOKEN_CAP,buildResidentSet};
|
|
111
|
+
tool);if(tokens+cost>cap){dropped.push(tool.name);continue}tools.push(tool);tokens+=cost}return{tools,wire:tools.map(toWireTool),tokens,dropped}}function estimateToolTokens(tool){return Math.ceil(JSON.stringify(toWireTool(tool)).length/4)}function matchesAnyGlob(name,patterns){return patterns.some(pattern=>globToRegExp(pattern).test(name))}function globToRegExp(pattern){const escaped=pattern.replace(/[.+?^${}()|[\]\\]/g,"\\$&").replace(/\*/g,".*");return new RegExp(`^${escaped}$`)}export{buildSystemPrompt,runTurn,describeAuditLog,createAuditLogger,currentBranch,displayCwd,RESIDENT_TOKEN_CAP,buildResidentSet};
|
package/dist/cli.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { createRequire as __twpCreateRequire } from 'node:module';
|
|
3
3
|
const require = __twpCreateRequire(import.meta.url);
|
|
4
|
-
import{isModeId,isPermissionModeId}from"./chunk-
|
|
4
|
+
import{isModeId,isPermissionModeId}from"./chunk-4WK2ECUX.js";import{GLOBAL_OPTIONS_HELP,HELP_TOKEN,isDomainName}from"./chunk-EOFANBVM.js";import{splitFlagToken}from"./chunk-QQRJLH6B.js";import"./chunk-VSJBJXZO.js";var BUILTIN_COMMANDS=["login","logout","whoami","update","task-loop"];var TASK_LOOP_ACTIONS=["run","status","stop","schedule","setup"];var VALUE_FLAGS=new Set(["-p","--print","--profile","--tenant","--mode","--permission-mode","--model","--project","--engine","--interval","--max-cycles","--ai","--workspace","--ai-config-file","--now","--counts","--gate","--output","--query"]);var BOOLEAN_FLAGS=new Set(["-h","--help","-v","--version","--no-tui","--doctor","--password","--token","--no-browser","--\
|
|
5
5
|
safe","--daemon","--force-runner","--force","--drain","--yes","-y","--no-ai-config-file","--verbose","--dry-run","--debug","--refresh"]);function dispatch(argv,limit=2){const tokens=[];const indexes=[];let truncated=false;for(let i=0;i<argv.length;i++){const arg=argv[i];if(arg===void 0)continue;if(arg.startsWith("-")&&arg!=="-"){const{name,value:inline}=splitFlagToken(arg);if(BOOLEAN_FLAGS.has(name)){if(inline!==void 0){truncated=true;break}continue}if(VALUE_FLAGS.has(name)){if(inline!==void 0)continue;
|
|
6
6
|
const next=argv[i+1];if(next!==void 0&&(!next.startsWith("-")||next==="-"))i++;continue}truncated=true;break}if(arg===""||arg==="-")continue;if(tokens.length>=limit)break;tokens.push(arg);indexes.push(i)}return{tokens,indexes,truncated}}function isBuiltin(token){return token!==void 0&&BUILTIN_COMMANDS.includes(token)}function isTaskLoopAction(token){return token!==void 0&&TASK_LOOP_ACTIONS.includes(token)}function resolveRoute(result){const{tokens,indexes}=result;const[first,second]=tokens;const firstIndex=indexes[0];
|
|
7
7
|
if(first===void 0||firstIndex===void 0)return{kind:"none",consumed:[]};const consumed=[firstIndex];const secondIndex=indexes[1];if(isBuiltin(first)){if(first==="task-loop"&&isTaskLoopAction(second)){if(secondIndex!==void 0)consumed.push(secondIndex);return{kind:"builtin",command:first,action:second,consumed}}return{kind:"builtin",command:first,...first==="task-loop"?{action:"run"}:{},consumed}}if(second!==void 0&&secondIndex!==void 0)consumed.push(secondIndex);return{kind:"domain",domain:first,...second!==
|
|
@@ -23,7 +23,7 @@ fig-file");if(out.noAiConfigFile)out.unknown.push("--no-ai-config-file")}if(out.
|
|
|
23
23
|
--verbose");if(out.scheduleNow!==void 0)out.unknown.push("--now");if(out.scheduleCounts!==void 0)out.unknown.push("--counts");if(out.scheduleGate!==void 0)out.unknown.push("--gate")}if(out.command==="task-loop"&&out.taskLoopAction!=="stop"&&out.stopForce){out.unknown.push("--force")}if(out.command==="task-loop"&&out.taskLoopAction!=="stop"&&out.stopDrain){out.unknown.push("--drain")}if(out.command==="task-loop"&&out.taskLoopAction==="stop"&&out.stopForce&&out.stopDrain){out.unknown.push("--force\
|
|
24
24
|
\u3068 --drain \u306F\u540C\u6642\u306B\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093");out.stopForce=false;out.stopDrain=false}if(out.command==="task-loop"&&out.taskLoopAction!=="setup"){if(out.yes)out.unknown.push("--yes");if(out.ais!==void 0)out.unknown.push("--ai");if(out.workspace!==void 0)out.unknown.push("--workspace");if(out.aiConfigFile!==void 0)out.unknown.push("--ai-config-file");if(out.noAiConfigFile)out.unknown.push("--no-ai-config-file")}if(out.command==="task-loop"&&(out.taskLoopAction===
|
|
25
25
|
"stop"||out.taskLoopAction==="status")){if(out.safe)out.unknown.push("--safe");if(out.daemon)out.unknown.push("--daemon");if(out.forceRunner)out.unknown.push("--force-runner");if(out.engine!==void 0)out.unknown.push("--engine");if(out.interval!==void 0)out.unknown.push("--interval");if(out.maxCycles!==void 0)out.unknown.push("--max-cycles")}if(out.command==="task-loop"&&out.taskLoopAction==="setup"){if(out.engine!==void 0)out.unknown.push("--engine");if(out.safe)out.unknown.push("--safe");if(out.
|
|
26
|
-
daemon)out.unknown.push("--daemon");if(out.forceRunner)out.unknown.push("--force-runner");if(out.interval!==void 0)out.unknown.push("--interval");if(out.maxCycles!==void 0)out.unknown.push("--max-cycles")}return out}var VERSION=true?"0.14.
|
|
26
|
+
daemon)out.unknown.push("--daemon");if(out.forceRunner)out.unknown.push("--force-runner");if(out.interval!==void 0)out.unknown.push("--interval");if(out.maxCycles!==void 0)out.unknown.push("--max-cycles")}return out}var VERSION=true?"0.14.1":"0.0.0-dev";var HELP=`twp ${VERSION} \u2014 TWP CLI
|
|
27
27
|
|
|
28
28
|
\u4F7F\u3044\u65B9:
|
|
29
29
|
twp \u5BFE\u8A71 TUI \u3092\u8D77\u52D5
|
|
@@ -150,6 +150,6 @@ TUI \u5185:
|
|
|
150
150
|
|
|
151
151
|
${HELP}`);process.exitCode=2;return}if(args.command==="domain"&&args.domain!==void 0){const{runDomain}=await import("./run-6FWRZNZR.js");process.exitCode=await runDomain({domain:args.domain,...args.operation!==void 0?{operation:args.operation}:{},argv:args.domainArgv,help:args.domainHelp,globals:{...args.profile!==void 0?{profile:args.profile}:{},...args.output!==void 0?{output:args.output}:{},...args.query!==void 0?{query:args.query}:{},dryRun:args.dryRun,debug:args.debug,yes:args.yes,refresh:args.
|
|
152
152
|
refresh},version:VERSION});return}if(args.command==="update"){const{runUpdate}=await import("./update-WDWUECN7.js");process.exitCode=await runUpdate({...args.profile!==void 0?{profile:args.profile}:{},version:VERSION});return}if(args.command==="login"||args.command==="logout"||args.command==="whoami"){const{runLogin,runLogout,runWhoami}=await import("./commands-YPT6RK74.js");const options={profile:args.profile,method:args.loginMethod,tenant:args.tenant,noBrowser:args.loginNoBrowser,cliVersion:VERSION};
|
|
153
|
-
const runner=args.command==="login"?runLogin:args.command==="logout"?runLogout:runWhoami;process.exitCode=await runner(options);return}if(args.command==="task-loop"){const{runTaskLoop}=await import("./commands-
|
|
154
|
-
engine,version:VERSION,verbose:args.verbose,scheduleNow:args.scheduleNow,scheduleCounts:args.scheduleCounts,scheduleGate:args.scheduleGate,yes:args.yes,ais:args.ais,workspace:args.workspace,aiConfigFile:args.aiConfigFile,noAiConfigFile:args.noAiConfigFile});return}if(args.command==="print"){const{runOneShot}=await import("./oneshot-
|
|
155
|
-
permissionMode}:{},...args.model!==void 0?{model:args.model}:{},...args.profile!==void 0?{profile:args.profile}:{},version:VERSION});return}const{startTui}=await import("./app-
|
|
153
|
+
const runner=args.command==="login"?runLogin:args.command==="logout"?runLogout:runWhoami;process.exitCode=await runner(options);return}if(args.command==="task-loop"){const{runTaskLoop}=await import("./commands-S7RTRVR5.js");process.exitCode=await runTaskLoop({action:args.taskLoopAction??"run",project:args.project,profile:args.profile,safe:args.safe,daemon:args.daemon,interval:args.interval,maxCycles:args.maxCycles,forceRunner:args.forceRunner,force:args.stopForce,drain:args.stopDrain,engine:args.
|
|
154
|
+
engine,version:VERSION,verbose:args.verbose,scheduleNow:args.scheduleNow,scheduleCounts:args.scheduleCounts,scheduleGate:args.scheduleGate,yes:args.yes,ais:args.ais,workspace:args.workspace,aiConfigFile:args.aiConfigFile,noAiConfigFile:args.noAiConfigFile});return}if(args.command==="print"){const{runOneShot}=await import("./oneshot-FI5F5SP5.js");process.exitCode=await runOneShot({prompt:args.prompt??"",fromStdin:args.promptFromStdin,mode:args.mode??"dev",...args.permissionMode!==void 0?{permissionMode:args.
|
|
155
|
+
permissionMode}:{},...args.model!==void 0?{model:args.model}:{},...args.profile!==void 0?{profile:args.profile}:{},version:VERSION});return}const{startTui}=await import("./app-BSEVWRJY.js");await startTui({mode:args.mode,permissionMode:args.permissionMode,model:args.model,profile:args.profile,noTui:args.noTui||!process.stdout.isTTY,doctor:args.doctor,version:VERSION})}await main();
|
|
@@ -77,8 +77,8 @@ const skill=typeof step.skill==="string"?step.skill.trim():"";if(!skill)return n
|
|
|
77
77
|
#ai:${category}`:`[${priority}] ${label} #ai:${category}`;const item={label:display.slice(0,200),prompt,task_key:taskKey};if(assign!==void 0){const ai=assign.selectPrimary(category,skill,priority,display);if(ai!=="")item.ai_type=ai}return item}function parsePlanExcludeKeys(prefetchSection){const m=/OPS_PLAN_EXCLUDE_KEYS\s+([^\s]*)\s+-->/.exec(prefetchSection);const keys=new Set;if(!m||!m[1])return keys;for(const raw of m[1].split(",")){const key=raw.trim();if(key!=="")keys.add(key)}return keys}
|
|
78
78
|
function excludedKeyInArgs(args,excluded){if(excluded.size===0)return null;for(const key of[...excluded].sort()){const re=new RegExp(`(?<![A-Za-z0-9-])${key.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")}(?![0-9])`);if(re.test(args))return key}return null}function parseOpsCount(prefetchSection,field){const marker=/OPS_COUNTS\s+([^>]*?)-->/.exec(prefetchSection);if(!marker||!marker[1])return null;const escaped=field.replace(/[.*+?^${}()|[\]\\]/g,"\\$&");const hit=new RegExp(`(?:^|\\s)${escaped}=(-?\\d+)(?:\
|
|
79
79
|
\\s|$)`).exec(marker[1]);if(!hit||hit[1]===void 0)return null;const n=Number.parseInt(hit[1],10);if(!Number.isFinite(n)||n<0)return null;return n}function releaseDeployDropReason(verifyBacklog,devVerifyPlanned){if(verifyBacklog===null){return"\u52D5\u4F5C\u78BA\u8A8D\u306E\u4EF6\u6570\u3092\u53D6\u5F97\u3067\u304D\u306A\u304B\u3063\u305F\uFF08\u5224\u5B9A\u4E0D\u80FD\u306E\u305F\u3081\u30EA\u30EA\u30FC\u30B9\u306F\u898B\u9001\u308B\uFF09"}if(verifyBacklog>devVerifyPlanned){return`\u52D5\u4F5C\u78BA\u8A8D${verifyBacklog}\
|
|
80
|
-
\u4EF6 > \u8A08\u753B\u5185dev-verify${devVerifyPlanned}\u4EF6\uFF08Phase 1\u306E0\u4EF6\u898B\u8FBC\u307F\u304C\u7ACB\u305F\u306A\u3044\uFF09`}return null}
|
|
81
|
-
0)reasons.set(skill,`${gate.label}0\u4EF6\u306E\u305F\u3081\u5BFE\u8C61\u306A\u3057`)}return reasons}var INFLIGHT_STALE_HOURS=3;function staleFloorHours(aiTimeoutSec){return Math.ceil(aiTimeoutSec*2/3600)}function inflightStaleHours(aiTimeoutSec,baseHours=INFLIGHT_STALE_HOURS){const base=Number.isFinite(baseHours)&&baseHours>0?baseHours:INFLIGHT_STALE_HOURS;return Math.max(base,staleFloorHours(aiTimeoutSec))}function ageMinutesOf(item,now){for(const raw of[item.started_at,item.updated_at,item.dequeued_at,item.created_at]){if(!raw)continue;const ts=Date.parse(raw);if(Number.isNaN(ts))continue;return Math.
|
|
80
|
+
\u4EF6 > \u8A08\u753B\u5185dev-verify${devVerifyPlanned}\u4EF6\uFF08Phase 1\u306E0\u4EF6\u898B\u8FBC\u307F\u304C\u7ACB\u305F\u306A\u3044\uFF09`}return null}function duplicateTaskKeyDropReason(enqueuedKeys,taskKey){if(!taskKey)return null;if(!enqueuedKeys.has(taskKey))return null;return`${taskKey} \u306F\u672C\u8A08\u753B\u3067\u65E2\u306B\u6295\u5165\u6E08\u307F\uFF08\u540C\u4E00\u30AD\u30FC\u306F1\u8A08\u753B1\u4EF6\uFF09`}var NO_ZERO_TARGET_GATES={};function zeroTargetDropReasons(prefetchSection,gates=NO_ZERO_TARGET_GATES){
|
|
81
|
+
const reasons=new Map;for(const[skill,gate]of Object.entries(gates)){const n=parseOpsCount(prefetchSection,gate.field);if(n===null)reasons.set(skill,`${gate.label}\u4EF6\u6570\u304C\u5224\u5B9A\u4E0D\u80FD\u306E\u305F\u3081\u898B\u9001\u308A`);else if(n===0)reasons.set(skill,`${gate.label}0\u4EF6\u306E\u305F\u3081\u5BFE\u8C61\u306A\u3057`)}return reasons}var INFLIGHT_STALE_HOURS=3;function staleFloorHours(aiTimeoutSec){return Math.ceil(aiTimeoutSec*2/3600)}function inflightStaleHours(aiTimeoutSec,baseHours=INFLIGHT_STALE_HOURS){const base=Number.isFinite(baseHours)&&baseHours>0?baseHours:INFLIGHT_STALE_HOURS;return Math.max(base,staleFloorHours(aiTimeoutSec))}function ageMinutesOf(item,now){for(const raw of[item.started_at,item.updated_at,item.dequeued_at,item.created_at]){if(!raw)continue;const ts=Date.parse(raw);if(Number.isNaN(ts))continue;return Math.
|
|
82
82
|
floor((now.getTime()-ts)/6e4)}return null}function inflightEntries(items,now=new Date,staleHours=INFLIGHT_STALE_HOURS){const staleMinutes=staleHours*60;const byKey=new Map;for(const item of items){const key=(item.task_key??"").trim();if(!key)continue;const ageMinutes=ageMinutesOf(item,now);if(ageMinutes!==null&&ageMinutes>staleMinutes)continue;const entry={key,runner:item.runner_id??"-",ageMinutes,label:(item.label??"").slice(0,60)};const prev=byKey.get(key);if(!prev||(entry.ageMinutes??-1)>(prev.
|
|
83
83
|
ageMinutes??-1))byKey.set(key,entry)}return[...byKey.values()].sort((a,b)=>a.key.localeCompare(b.key))}function formatInflightEntry(entry){const age=entry.ageMinutes===null?"\u4E0D\u660E":`${entry.ageMinutes}\u5206`;return`${entry.key} runner=${entry.runner} \u7D4C\u904E=${age}`}import fs5 from"fs";import path4 from"path";async function createItem(api,body){const res=await api.create(body);if(!res.ok)return{itemId:null,detail:describeError(res)};for(const p of["item_id","id","item.item_id","item.id","data.item_id","data.id"]){const v=pickString(res.json,p);if(v)return{itemId:v,detail:""}}return{itemId:null,detail:`item_id \u3092\u8AAD\u3081\u307E\u305B\u3093: ${res.raw.slice(0,200)}`}}function reorderSucceeded(targetId,json){if(pick(json,"result")===true)return true;const raw=Array.isArray(json)?json:pick(json,"i\
|
|
84
84
|
tems");if(!Array.isArray(raw)||raw.length===0)return false;const items=raw;const orderOf=it=>typeof it.sort_order==="number"?it.sort_order:Number.POSITIVE_INFINITY;const hit=items.find(it=>(it.item_id??"")===targetId);if(!hit)return false;return orderOf(hit)===Math.min(...items.map(orderOf))}function queueContainsKey(items,key){const re=new RegExp(`${key.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")}(?![0-9])`);return items.some(it=>re.test(`${it.label??""}
|
|
@@ -242,18 +242,19 @@ return null}if(pending===null||processing===null){log.log(` \u26A0\uFE0F ${pen
|
|
|
242
242
|
config.aiTimeoutSec)});const exclusive=entries.filter(e=>config.ai.isExclusiveSkill(e.skill));if(exclusive.length>0){log.log(" \u65E2\u306B\u30AD\u30E5\u30FC/\u5B9F\u884C\u4E2D\u306E\u6392\u4ED6\u30B9\u30AD\u30EB\uFF08\u3053\u306E\u8A08\u753B\u304B\u3089\u306F\u9664\u5916\u3057\u307E\u3059\uFF09:");for(const entry of exclusive)log.log(` - ${formatExclusiveEntry(entry)}`)}exclusiveQueued=new Set(exclusive.map(e=>e.skill));return exclusiveQueued};let recentCandidates=null;let recentFetched=false;
|
|
243
243
|
let resultFetchBudget=5;const recentAdvanceFor=async(taskKey,skill)=>{if(!recentFetched){recentFetched=true;const items=await this.deps.api.completedSince(windowStartMicros(new Date));if(items===null){log.log(" \u26A0\uFE0F \u76F4\u8FD1\u306E\u5B9F\u884C\u53F0\u5E33\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F");log.log(" \u300C\u524D\u56DE\u304C\u72B6\u614B\u3092\u9032\u3081\u305F\u5834\u5408\u306E\u518D\u6295\u5165\u6291\u6B62\u300D\u306F**\u3053\u306E\u30B5\u30A4\u30AF\u30EB\u7121\u52B9**\u3067\u3059\uFF08\u6295\u5165\u306F\u6B62\u3081\u307E\u305B\u3093\uFF09")}else{
|
|
244
244
|
recentCandidates=buildRecentCandidateIndex(items);log.log(` \u76F4\u8FD1${RECENT_ADVANCE_WINDOW_HOURS}\u6642\u9593\u306B\u540C\u4E00\u30BF\u30B9\u30AF\u3092\u6271\u3063\u305F\u5B9F\u884C: ${recentCandidates.size}\u4EF6`)}}if(recentCandidates===null)return null;const candidate=findRecentCandidate(recentCandidates,taskKey,skill);if(candidate===null)return null;return resolveRecentAdvance(candidate,async itemId=>{if(resultFetchBudget<=0)return null;resultFetchBudget-=1;const res=await this.deps.api.
|
|
245
|
-
getItem(itemId);if(!res.ok){log.log(` \u26A0\uFE0F \u76F4\u8FD1\u30A2\u30A4\u30C6\u30E0\u306E\u7D50\u679C\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\uFF08${describeError(res)}\uFF09\u3002${taskKey} \u306E\u518D\u6295\u5165\u306F\u6291\u6B62\u3057\u307E\u305B\u3093`);return null}return res.json?.item?.result??null})};const exclusiveEnqueued=new Set;let enqueued=0;for(const step of plan.steps){const item=stepToItem(step,config.ai);if(!item)continue;
|
|
246
|
-
test(step.skill)){log.log(` \u26A0\uFE0F \u30B9\u30AD\u30EB\u540D\u304C\u60F3\u5B9A\u306E\u6587\u5B57\u7A2E\u3067\u306F\u3042\u308A\u307E\u305B\u3093\uFF08skill='${step.skill}'\uFF09\u3002\u6642\u9593\u5E2F\u30B2\u30FC\u30C8\u3068\u30AB\u30C6\u30B4\u30EA\u5224\u5B9A\u304C\u52B9\u304D\u307E\u305B\u3093`)}const placeholder=placeholderTaskKey(step.args??"");if(placeholder!==null){log.log(` \u30A8\u30F3\u30AD\u30E5\u30FC\u6291\u6B62\uFF08\u30BF\u30B9\u30AF\u30AD\u30FC\u304C\u30D7\u30EC\u30FC\u30B9\u30DB\u30EB\u30C0\uFF09: ${step.
|
|
245
|
+
getItem(itemId);if(!res.ok){log.log(` \u26A0\uFE0F \u76F4\u8FD1\u30A2\u30A4\u30C6\u30E0\u306E\u7D50\u679C\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\uFF08${describeError(res)}\uFF09\u3002${taskKey} \u306E\u518D\u6295\u5165\u306F\u6291\u6B62\u3057\u307E\u305B\u3093`);return null}return res.json?.item?.result??null})};const exclusiveEnqueued=new Set;const enqueuedTaskKeys=new Set;let enqueued=0;for(const step of plan.steps){const item=stepToItem(step,config.ai);if(!item)continue;
|
|
246
|
+
if(!/^[a-z][a-z0-9-]*$/.test(step.skill)){log.log(` \u26A0\uFE0F \u30B9\u30AD\u30EB\u540D\u304C\u60F3\u5B9A\u306E\u6587\u5B57\u7A2E\u3067\u306F\u3042\u308A\u307E\u305B\u3093\uFF08skill='${step.skill}'\uFF09\u3002\u6642\u9593\u5E2F\u30B2\u30FC\u30C8\u3068\u30AB\u30C6\u30B4\u30EA\u5224\u5B9A\u304C\u52B9\u304D\u307E\u305B\u3093`)}const placeholder=placeholderTaskKey(step.args??"");if(placeholder!==null){log.log(` \u30A8\u30F3\u30AD\u30E5\u30FC\u6291\u6B62\uFF08\u30BF\u30B9\u30AF\u30AD\u30FC\u304C\u30D7\u30EC\u30FC\u30B9\u30DB\u30EB\u30C0\uFF09: ${step.
|
|
247
247
|
skill} \u2014 args \u306B '${placeholder}' \u304C\u6B8B\u3063\u3066\u3044\u307E\u3059 | ${item.label}`);continue}const stepSkill=normalizeSkillName(step.skill??"");if(stepSkill==="release-deploy"&&releaseDeployDrop!==null){log.log(` \u30A8\u30F3\u30AD\u30E5\u30FC\u6291\u6B62\uFF08release-deploy \u306E\u7A7A\u632F\u308A\u9632\u6B62\uFF09: ${releaseDeployDrop} | ${item.label}`);continue}const zeroTargetReason=zeroTargetDrops.get(stepSkill);if(zeroTargetReason!==void 0){log.log(` \u30A8\u30F3\u30AD\u30E5\u30FC\u6291\u6B62\uFF08\u5BFE\u8C610\u4EF6\uFF09: ${step.
|
|
248
|
-
skill} \u2014 ${zeroTargetReason} | ${item.label}`);continue}if(item.task_key&&inflightKeys.has(item.task_key)){log.log(` \u30A8\u30F3\u30AD\u30E5\u30FC\u6291\u6B62\uFF08\u4ED6\u30E9\u30F3\u30CA\u30FC\u304C\u51E6\u7406\u4E2D\uFF09: ${step.skill} \u2014 ${item.task_key} \u306F\u4ED6\u30E9\u30F3\u30CA\u30FC\u304C\u51E6\u7406\u4E2D | ${item.label}`);continue}const
|
|
249
|
-
skill} \u2014 ${
|
|
250
|
-
|
|
251
|
-
log.log(` \u26D4 \u30A8\u30F3\u30AD\u30E5\u30FC\u4E2D\u306B\u8A08\u753B\u30ED\u30C3\u30AF\u3092\u5931\u3044\u307E\u3057\u305F\uFF08reason=${this.planLock.lostReasonText()}\uFF09\u2192 \u3053\u3053\u3067\u4E2D\u6B62\u3057\u307E\u3059\uFF08\u6295\u5165\u6E08\u307F: ${enqueued}\
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
log.
|
|
255
|
-
|
|
256
|
-
|
|
248
|
+
skill} \u2014 ${zeroTargetReason} | ${item.label}`);continue}if(item.task_key&&inflightKeys.has(item.task_key)){log.log(` \u30A8\u30F3\u30AD\u30E5\u30FC\u6291\u6B62\uFF08\u4ED6\u30E9\u30F3\u30CA\u30FC\u304C\u51E6\u7406\u4E2D\uFF09: ${step.skill} \u2014 ${item.task_key} \u306F\u4ED6\u30E9\u30F3\u30CA\u30FC\u304C\u51E6\u7406\u4E2D | ${item.label}`);continue}const duplicateKey=duplicateTaskKeyDropReason(enqueuedTaskKeys,item.task_key);if(duplicateKey!==null){log.log(` \u30A8\u30F3\u30AD\u30E5\u30FC\u6291\u6B62\uFF08\u540C\u4E00\u8A08\u753B\u5185\u306E\u91CD\u8907\u30AD\u30FC\uFF09: ${step.
|
|
249
|
+
skill} \u2014 ${duplicateKey} | ${item.label}`);continue}const excludedKey=excludedKeyInArgs(step.args??"",excludeKeys);if(excludedKey!==null){log.log(` \u30A8\u30F3\u30AD\u30E5\u30FC\u6291\u6B62\uFF08\u4EBA\u306B\u30DC\u30FC\u30EB\u304C\u3042\u308B\uFF09: ${step.skill} \u2014 ${excludedKey} \u306F\u672A\u56DE\u7B54\u306E\u8CEA\u554F\u3092\u6301\u3064\u4EBA\u9593\u5F85\u3061\u30BF\u30B9\u30AF | ${item.label}`);continue}if(item.task_key){const advance=await recentAdvanceFor(item.task_key,step.skill);
|
|
250
|
+
if(advance!==null){const gate2=shouldSuppressForStatus(advance,taskStatusSnapshot);if(gate2.suppress){log.log(` \u30A8\u30F3\u30AD\u30E5\u30FC\u6291\u6B62\uFF08\u524D\u56DE\u304C\u72B6\u614B\u3092\u9032\u3081\u305F\uFF09: ${step.skill} \u2014 ${item.task_key} \u306F ${formatRecentAdvance(advance)} | ${item.label}`);continue}log.log(` \u6291\u6B62\u3092\u898B\u9001\u308A: ${step.skill} \u2014 ${item.task_key} \u306F ${formatRecentAdvance(advance)} \u3060\u304C ${gate2.reason} | ${item.label}`)}}
|
|
251
|
+
const gate=await this.schedule.gateAllows(step.skill);if(!gate.allowed){log.log(` \u30A8\u30F3\u30AD\u30E5\u30FC\u6291\u6B62\uFF08\u6642\u9593\u5E2F\u30B2\u30FC\u30C8\uFF09: ${step.skill} \u2014 ${gate.reason} | ${item.label}`);continue}if(this.planLock.isLost()){log.log(` \u26D4 \u30A8\u30F3\u30AD\u30E5\u30FC\u4E2D\u306B\u8A08\u753B\u30ED\u30C3\u30AF\u3092\u5931\u3044\u307E\u3057\u305F\uFF08reason=${this.planLock.lostReasonText()}\uFF09\u2192 \u3053\u3053\u3067\u4E2D\u6B62\u3057\u307E\u3059\uFF08\u6295\u5165\u6E08\u307F: ${enqueued}\
|
|
252
|
+
\u4EF6\uFF09`);break}const exclusiveSkill=config.ai.isExclusiveSkill(step.skill)?normalizeSkillName(step.skill):null;if(exclusiveSkill!==null){if(exclusiveEnqueued.has(exclusiveSkill)){log.log(` \u30A8\u30F3\u30AD\u30E5\u30FC\u6291\u6B62\uFF08\u5916\u90E8\u6295\u7A3F\u30B9\u30AD\u30EB\u306E\u540C\u6642\u5B9F\u884C\uFF09: ${step.skill} \u2014 \u540C\u3058\u8A08\u753B\u306B\u65E2\u306B1\u4EF6\u3042\u308A\u307E\u3059 | ${item.label}`);continue}const queuedSkills=await exclusiveInflight();if(queuedSkills?.
|
|
253
|
+
has(exclusiveSkill)){log.log(` \u30A8\u30F3\u30AD\u30E5\u30FC\u6291\u6B62\uFF08\u5916\u90E8\u6295\u7A3F\u30B9\u30AD\u30EB\u306E\u540C\u6642\u5B9F\u884C\uFF09: ${step.skill} \u2014 \u65E2\u306B\u30AD\u30E5\u30FC/\u5B9F\u884C\u4E2D\u306E\u305F\u3081\u7A4D\u307F\u307E\u305B\u3093 | ${item.label}`);continue}}const{itemId,detail}=await createItem(this.deps.api,item);if(itemId){enqueued+=1;if(exclusiveSkill!==null)exclusiveEnqueued.add(exclusiveSkill);if(item.task_key)enqueuedTaskKeys.add(item.task_key)}else{
|
|
254
|
+
log.log(` \u8B66\u544A: \u30A8\u30F3\u30AD\u30E5\u30FC\u5931\u6557: ${item.label} \u2014 ${detail}`)}}log.log(`\u8A08\u753B\u5B8C\u4E86: ${enqueued} \u30A2\u30A4\u30C6\u30E0\u3092\u30AD\u30E5\u30FC\u306B\u8FFD\u52A0\u3057\u307E\u3057\u305F`);return"ok"}async runDequeueLoop(cycle){const{config,log,api,runner}=this.deps;log.separator();log.log("Phase 2: \u30AD\u30E5\u30FC\u304B\u3089\u30C7\u30AD\u30E5\u30FC\u3057\u3066\u9806\u6B21\u5B9F\u884C...");log.separator();let completed=0;let failed=0;let unexecuted=0;
|
|
255
|
+
let unexecutedNeedsHuman=false;let stepNum=0;let contendedRetry=0;let undetermined=false;let stop=false;dequeue:for(;;){if(this.draining){log.log("\u30C9\u30EC\u30A4\u30F3\u8981\u6C42\u3092\u53D7\u3051\u3066\u3044\u308B\u305F\u3081\u3001\u65B0\u3057\u3044\u30A2\u30A4\u30C6\u30E0\u306F\u53D6\u5F97\u3057\u307E\u305B\u3093\u3002Phase 2 \u3092\u7D42\u4E86\u3057\u307E\u3059\u3002");stop=true;break}const claimed=await this.claimOne();if(claimed.kind==="undetermined"){undetermined=true;break}if(claimed.
|
|
256
|
+
kind==="contended"){contendedRetry+=1;if(contendedRetry>=config.contendedMax){log.log(` \u26A0\uFE0F contended \u304C ${contendedRetry} \u56DE\u7D9A\u304D\u307E\u3057\u305F\u3002\u3053\u306E\u30B5\u30A4\u30AF\u30EB\u3067\u306E\u53D6\u5F97\u3092\u8AE6\u3081\u307E\u3059\uFF08\u4ED6\u6A5F\u304C\u51E6\u7406\u3092\u7D9A\u3051\u3066\u3044\u308B\u53EF\u80FD\u6027\u304C\u9AD8\u3044\uFF09`);undetermined=true;break}log.log(` \u2139\uFE0F \u4ED6\u306E\u30E9\u30F3\u30CA\u30FC\u304C\u5148\u306B\u53D6\u5F97\u3057\u307E\u3057\u305F\uFF08contended\u30FB${contendedRetry}\
|
|
257
|
+
\u56DE\u76EE\uFF09\u30023\u79D2\u5F8C\u306B\u518D\u8A66\u884C\u3057\u307E\u3059`);await this.sleep(3e3);continue}contendedRetry=0;if(claimed.kind==="empty"){log.log("\u30AD\u30E5\u30FC\u306Bpending\u30A2\u30A4\u30C6\u30E0\u304C\u3042\u308A\u307E\u305B\u3093\u3002Phase 2 \u5B8C\u4E86\u3002");break}const item=claimed.item;const itemId=item.item_id??"";const prompt=(item.prompt??"").trim();const label=item.label??"";if(!itemId||!prompt){log.log(`\u30C7\u30AD\u30E5\u30FC\u7D50\u679C\u306E\u30D1\u30FC\u30B9\u306B\u5931\u6557\u3057\u307E\u3057\u305F: ${JSON.
|
|
257
258
|
stringify(item).slice(0,200)}`);break}stepNum+=1;log.separator();log.log(`[${stepNum}] ${label}`);log.log(` item_id: ${itemId}`);await runner.beat("dequeue",itemId);log.log(` prompt: ${prompt}`);log.separator();const stopMatch=/^\/stop(?:\s+(\d+))?$/.exec(prompt);if(stopMatch){const res=await api.update(itemId,{status:"completed"},config.runId);if(res.status===409){log.log(" \u26A0\uFE0F /stop \u30A2\u30A4\u30C6\u30E0\u306F\u65E2\u306B\u5225\u306E\u30E9\u30F3\u30CA\u30FC\u304C\u4FDD\u6301\u3057\u3066\u3044\u307E\u3059\uFF08409\uFF09\u3002\u3053\u3061\u3089\u3067\u306F\u8A18\u9332\u3057\u307E\u305B\u3093")}else if(!res.
|
|
258
259
|
ok){log.log(` \u26D4 /stop \u30A2\u30A4\u30C6\u30E0\u3092 completed \u306B\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\uFF08${describeError(res)}\uFF09`);log.log(" \u3053\u306E\u30A2\u30A4\u30C6\u30E0\u306F\u56DE\u53CE\u5F8C\u306B pending \u3078\u623B\u308B\u305F\u3081\u3001**\u6B21\u56DE\u8D77\u52D5\u6642\u3082\u5373\u505C\u6B62\u3057\u307E\u3059**");log.log(` \u5FA9\u65E7: UI \u304BAPI\u3067 item=${itemId} \u3092 completed / failed \u306B\u3057\u3066\u304F\u3060\u3055\u3044`)}completed+=
|
|
259
260
|
1;const waitSec=stopMatch[1];if(waitSec){const requested=Number.parseInt(waitSec,10);const capped=Math.min(requested,STOP_WAIT_MAX_SEC);if(capped!==requested){log.log(` \u26A0\uFE0F /stop \u306E\u5F85\u6A5F ${requested}\u79D2 \u306F\u4E0A\u9650 ${STOP_WAIT_MAX_SEC}\u79D2 \u306B\u4E38\u3081\u307E\u3059`)}log.log(`[${stepNum}] /stop ${capped} \u2192 ${capped}\u79D2\u9593\u5F85\u6A5F\u3057\u307E\u3059...`);await this.sleepUnlessDraining(capped*1e3);log.log(`[${stepNum}] \u5F85\u6A5F\u5B8C\u4E86\u3002\u6B21\u306E\u30A2\u30A4\u30C6\u30E0\u306B\u9032\u307F\u307E\u3059\u3002`);
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { createRequire as __twpCreateRequire } from 'node:module';
|
|
2
2
|
const require = __twpCreateRequire(import.meta.url);
|
|
3
|
-
import{buildResidentSet,buildSystemPrompt,createAuditLogger,currentBranch,displayCwd,runTurn}from"./chunk-
|
|
3
|
+
import{buildResidentSet,buildSystemPrompt,createAuditLogger,currentBranch,displayCwd,runTurn}from"./chunk-ZVZL4QHS.js";import"./chunk-N2UVRM3Z.js";import{getMode}from"./chunk-4WK2ECUX.js";import{RelayError,createRuntime,pickModel}from"./chunk-RQFG3OUL.js";import{checkMinSupportedVersion,enforceMinSupportedVersion,floorNeedsRefresh}from"./chunk-DXXFUNYN.js";import"./chunk-PMOUHEJQ.js";import"./chunk-63LDNYGW.js";import"./chunk-NERYSBA4.js";import"./chunk-RZVI6PMW.js";
|
|
4
4
|
import"./chunk-J7QYPKVK.js";import{stripTerminalControls}from"./chunk-NHYMHCAT.js";import"./chunk-VSJBJXZO.js";async function runOneShot(opts,deps={}){const out=deps.out??(text=>void process.stdout.write(stripTerminalControls(text)));const err=deps.err??(text=>void process.stderr.write(stripTerminalControls(text)));const prompt=opts.fromStdin?await(deps.readStdin??readStdin)():opts.prompt;if(prompt.trim()===""){err('\u30D7\u30ED\u30F3\u30D7\u30C8\u304C\u7A7A\u3067\u3059\u3002`twp -p "\u8CEA\u554F"`\uFF08`-p -` \u3067\u6A19\u6E96\u5165\u529B\uFF09\n');return 2}const runtime=deps.runtime??createRuntime({...opts.
|
|
5
5
|
profile!==void 0?{profile:opts.profile}:{},...opts.model!==void 0?{model:opts.model}:{},cliVersion:opts.version});const cachedFloor=runtime.loadCachedFloor();if(await checkMinSupportedVersion({current:opts.version,cachedFloor:cachedFloor.minSupportedVersion,refresh:async()=>(await runtime.loadCatalog()).minSupportedVersion,write:err})){return 1}if(!runtime.loggedIn){err("\u30ED\u30B0\u30A4\u30F3\u3057\u3066\u3044\u307E\u305B\u3093\u3002`twp login` \u3092\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n");
|
|
6
6
|
return 1}let model=runtime.configuredModel??"";let catalog=null;if(model===""){catalog=await runtime.loadCatalog();const picked=pickModel(catalog,void 0);model=picked.model;if(catalog.source!=="server"){err(`\u26A0 \u30E2\u30C7\u30EB\u4E00\u89A7\u3092\u53D6\u5F97\u3067\u304D\u306A\u304B\u3063\u305F\u305F\u3081 ${model} \u3067\u5B9F\u884C\u3057\u307E\u3059\uFF08${catalog.source}\uFF09
|
|
7
|
-
`)}}else if(floorNeedsRefresh(cachedFloor.fetchedAt)){catalog=await runtime.loadCatalog()}if(catalog!==null&&enforceMinSupportedVersion({current:opts.version,floor:catalog.minSupportedVersion,write:err})){return 1}const controller=new AbortController;let interrupted=false;const onSigint=()=>{interrupted=true;controller.abort()};process.on("SIGINT",onSigint);let wroteText=false;try{const mode=getMode(opts.mode);const resident=buildResidentSet(mode,{...opts.permissionMode!==void 0?
|
|
8
|
-
permissionMode}:{}});const audit=deps.audit??createAuditLogger({mode:mode.id,permissionMode:opts.permissionMode,model,cwd:process.cwd(),cliVersion:opts.version,interactive:false,onOpen:file=>err(`audit: ${file}
|
|
9
|
-
`)});const result=await runTurn(runtime.client,runtime.context,{input:prompt,model,system:buildSystemPrompt({cwd:displayCwd(),branch:currentBranch(),modeLabel:mode.label,cliVersion:opts.version,toolNames:resident.tools.map(t=>t.name)}),signal:controller.signal,onTextDelta:delta=>{wroteText=true;out(stripTerminalControls(delta))},tools:resident.tools,execute:{mode,ctx:{cwd:process.cwd()},sessionAllow:new Set,...opts.permissionMode!==void 0?{permissionMode:opts.permissionMode}:{},audit},onToolUse:()=>{
|
|
7
|
+
`)}}else if(floorNeedsRefresh(cachedFloor.fetchedAt)){catalog=await runtime.loadCatalog()}if(catalog!==null&&enforceMinSupportedVersion({current:opts.version,floor:catalog.minSupportedVersion,write:err})){return 1}const controller=new AbortController;let interrupted=false;const onSigint=()=>{interrupted=true;controller.abort()};process.on("SIGINT",onSigint);let wroteText=false;let ownedAudit=null;try{const mode=getMode(opts.mode);const resident=buildResidentSet(mode,{...opts.permissionMode!==void 0?
|
|
8
|
+
{permissionMode:opts.permissionMode}:{}});const audit=deps.audit??(ownedAudit=createAuditLogger({mode:mode.id,permissionMode:opts.permissionMode,model,cwd:process.cwd(),cliVersion:opts.version,interactive:false,onOpen:file=>err(`audit: ${file}
|
|
9
|
+
`)}));const result=await runTurn(runtime.client,runtime.context,{input:prompt,model,system:buildSystemPrompt({cwd:displayCwd(),branch:currentBranch(),modeLabel:mode.label,cliVersion:opts.version,toolNames:resident.tools.map(t=>t.name)}),signal:controller.signal,onTextDelta:delta=>{wroteText=true;out(stripTerminalControls(delta))},tools:resident.tools,execute:{mode,ctx:{cwd:process.cwd()},sessionAllow:new Set,...opts.permissionMode!==void 0?{permissionMode:opts.permissionMode}:{},audit},onToolUse:()=>{
|
|
10
10
|
if(wroteText){out("\n");wroteText=false}},onToolResult:(call,result2)=>err(`tool: ${call.name} \u2192 ${result2.denied===true?"denied":result2.isError===true?"error":"ok"}
|
|
11
11
|
`)});if(result.text!==""&&!result.text.endsWith("\n"))out("\n");const u=result.usage;err(`usage: model=${model} input=${u.inputTokens} cache_read=${u.cacheReadTokens} cache_write=${u.cacheWriteTokens} output=${u.outputTokens}
|
|
12
12
|
`);if(result.droppedMessages>0){err(`\u26A0 \u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u4E0A\u9650\u306E\u305F\u3081\u53E4\u3044\u3084\u308A\u53D6\u308A ${result.droppedMessages} \u4EF6\u3092\u843D\u3068\u3057\u307E\u3057\u305F
|
|
@@ -15,4 +15,4 @@ if(wroteText){out("\n");wroteText=false}},onToolResult:(call,result2)=>err(`tool
|
|
|
15
15
|
outputTokens>0){err(`usage(\u4E2D\u65AD\u307E\u3067): input=${partial.inputTokens} cache_read=${partial.cacheReadTokens} cache_write=${partial.cacheWriteTokens} output=${partial.outputTokens}
|
|
16
16
|
`)}if(e instanceof RelayError){err(`${e.message}
|
|
17
17
|
`);return 1}err(`\u30A8\u30E9\u30FC: ${e.message}
|
|
18
|
-
`);return 1}finally{process.off("SIGINT",onSigint)}}async function readStdin(){const chunks=[];for await(const chunk of process.stdin)chunks.push(Buffer.from(chunk));return Buffer.concat(chunks).toString("utf8")}export{runOneShot};
|
|
18
|
+
`);return 1}finally{process.off("SIGINT",onSigint);ownedAudit?.close()}}async function readStdin(){const chunks=[];for await(const chunk of process.stdin)chunks.push(Buffer.from(chunk));return Buffer.concat(chunks).toString("utf8")}export{runOneShot};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tocca-systems/twp-cli",
|
|
3
|
-
"version": "0.14.
|
|
3
|
+
"version": "0.14.1",
|
|
4
4
|
"description": "TWP CLI — Tocca Working Platform の CLI 型統合インターフェース（AIエージェントハーネス）",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|
|
@@ -25,11 +25,13 @@
|
|
|
25
25
|
"bench:startup": "node scripts/bench-startup.mjs",
|
|
26
26
|
"build": "tsup && node scripts/generate-third-party-notices.mjs",
|
|
27
27
|
"changeset": "changeset",
|
|
28
|
+
"check:command-model": "tsx scripts/generate-command-model.ts --check",
|
|
28
29
|
"check:dist": "node scripts/check-dist-externals.mjs",
|
|
29
30
|
"check:notices": "node scripts/generate-third-party-notices.mjs --check",
|
|
30
31
|
"check:package": "node scripts/check-package-contents.mjs",
|
|
31
32
|
"check:public-changelog": "node scripts/generate-public-changelog.mjs --check",
|
|
32
33
|
"dev": "tsx src/cli.ts",
|
|
34
|
+
"generate:command-model": "tsx scripts/generate-command-model.ts",
|
|
33
35
|
"lint": "eslint .",
|
|
34
36
|
"lint:fix": "eslint . --fix",
|
|
35
37
|
"prepack": "npm run build",
|
|
@@ -59,7 +61,8 @@
|
|
|
59
61
|
"tsup": "^8.5.1",
|
|
60
62
|
"tsx": "^4.23.13",
|
|
61
63
|
"typescript": "^6.0.3",
|
|
62
|
-
"vitest": "^4.1.11"
|
|
64
|
+
"vitest": "^4.1.11",
|
|
65
|
+
"yaml": "^2.9.0"
|
|
63
66
|
},
|
|
64
67
|
"overrides": {
|
|
65
68
|
"esbuild": "^0.28.2"
|