@umsai/ums-code 0.0.14-v2 → 0.1.4-v2

package/dist/src/ui/hooks/useExtensionUpdates.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useExtensionUpdates.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useExtensionUpdates.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC5B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EACL,gBAAgB,EAChB,wBAAwB,EACxB,aAAa,GACd,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAA2B,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,0BAA0B,EAAE,MAAM,gDAAgD,CAAC;AAC5F,OAAO,EACL,2BAA2B,EAC3B,eAAe,GAChB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IACrC,MAAM,QAAQ,GAAG,MAAM,cAAc,EAAa,CAAC;IACnD,OAAO;QACL,GAAG,QAAQ;QACX,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE;KACjB,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,IAAI,CAAC,mCAAmC,EAAE,GAAG,EAAE,CAAC,CAAC;IAClD,2BAA2B,EAAE,EAAE,CAAC,EAAE,EAAE;IACpC,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE;CACzB,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,IAAI,WAAmB,CAAC;IACxB,IAAI,iBAAyB,CAAC;IAE9B,UAAU,CAAC,GAAG,EAAE;QACd,WAAW,GAAG,EAAE,CAAC,WAAW,CAC1B,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,uBAAuB,CAAC,CAChD,CAAC;QACF,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QACnD,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;QACnE,EAAE,CAAC,SAAS,CAAC,iBAAiB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACrD,EAAE,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC,SAAS,EAAE,CAAC;QACnD,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,SAAS,EAAE,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sEAAsE,EAAE,KAAK,IAAI,EAAE;QACpF,MAAM,UAAU,GAAG;YACjB;gBACE,IAAI,EAAE,gBAAgB;gBACtB,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,YAAY;gBAClB,QAAQ,EAAE,IAAI;gBACd,eAAe,EAAE;oBACf,IAAI,EAAE,KAAK;oBACX,MAAM,EAAE,mBAAmB;oBAC3B,UAAU,EAAE,KAAK;iBAClB;aACF;SACF,CAAC;QACF,MAAM,OAAO,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QACxB,MAAM,GAAG,GAAG,WAAW,CAAC;QAExB,EAAE,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC,kBAAkB,CACvD,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE;YAC7B,QAAQ,CAAC;gBACP,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE;oBACP,IAAI,EAAE,gBAAgB;oBACtB,KAAK,EAAE,oBAAoB,CAAC,gBAAgB;iBAC7C;aACF,CAAC,CAAC;QACL,CAAC,CACF,CAAC;QAEF,UAAU,CAAC,GAAG,EAAE,CACd,mBAAmB,CAAC,UAAkC,EAAE,OAAO,EAAE,GAAG,CAAC,CACtE,CAAC;QAEF,MAAM,OAAO,CAAC,GAAG,EAAE;YACjB,MAAM,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAClC;gBACE,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,6FAA6F;aACpG,EACD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yEAAyE,EAAE,KAAK,IAAI,EAAE;QACvF,MAAM,YAAY,GAAG,eAAe,CAAC;YACnC,aAAa,EAAE,iBAAiB;YAChC,IAAI,EAAE,gBAAgB;YACtB,OAAO,EAAE,OAAO;YAChB,eAAe,EAAE;gBACf,MAAM,EAAE,uBAAuB;gBAC/B,IAAI,EAAE,KAAK;gBACX,UAAU,EAAE,IAAI;aACjB;SACF,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,wBAAwB,CACxC,CAAC,aAAa,CAAC,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,CAAE,CAAC,EAC7D,WAAW,EACX,IAAI,0BAA0B,CAAC,gBAAgB,CAAC,oBAAoB,EAAE,CAAC,CACxE,CAAC,CAAC,CAAC,CAAC;QAEL,MAAM,OAAO,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QAExB,EAAE,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC,kBAAkB,CACvD,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE;YAC7B,QAAQ,CAAC;gBACP,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE;oBACP,IAAI,EAAE,gBAAgB;oBACtB,KAAK,EAAE,oBAAoB,CAAC,gBAAgB;iBAC7C;aACF,CAAC,CAAC;QACL,CAAC,CACF,CAAC;QAEF,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,iBAAiB,CAAC;YAC3C,eAAe,EAAE,OAAO;YACxB,cAAc,EAAE,OAAO;YACvB,IAAI,EAAE,EAAE;SACT,CAAC,CAAC;QAEH,UAAU,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC;QAEzE,MAAM,OAAO,CACX,GAAG,EAAE;YACH,MAAM,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAClC;gBACE,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,iEAAiE;aACxE,EACD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;QACJ,CAAC,EACD,EAAE,OAAO,EAAE,IAAI,EAAE,CAClB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;QACzE,MAAM,aAAa,GAAG,eAAe,CAAC;YACpC,aAAa,EAAE,iBAAiB;YAChC,IAAI,EAAE,kBAAkB;YACxB,OAAO,EAAE,OAAO;YAChB,eAAe,EAAE;gBACf,MAAM,EAAE,wBAAwB;gBAChC,IAAI,EAAE,KAAK;gBACX,UAAU,EAAE,IAAI;aACjB;SACF,CAAC,CAAC;QACH,MAAM,aAAa,GAAG,eAAe,CAAC;YACpC,aAAa,EAAE,iBAAiB;YAChC,IAAI,EAAE,kBAAkB;YACxB,OAAO,EAAE,OAAO;YAChB,eAAe,EAAE;gBACf,MAAM,EAAE,wBAAwB;gBAChC,IAAI,EAAE,KAAK;gBACX,UAAU,EAAE,IAAI;aACjB;SACF,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,wBAAwB,CACzC;YACE,aAAa,CAAC;gBACZ,YAAY,EAAE,aAAa;gBAC3B,YAAY,EAAE,WAAW;aAC1B,CAAE;YACH,aAAa,CAAC;gBACZ,YAAY,EAAE,aAAa;gBAC3B,YAAY,EAAE,WAAW;aAC1B,CAAE;SACJ,EACD,WAAW,EACX,IAAI,0BAA0B,CAAC,gBAAgB,CAAC,oBAAoB,EAAE,CAAC,CACxE,CAAC;QAEF,MAAM,OAAO,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QAExB,EAAE,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC,kBAAkB,CACvD,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE;YAC7B,QAAQ,CAAC;gBACP,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE;oBACP,IAAI,EAAE,kBAAkB;oBACxB,KAAK,EAAE,oBAAoB,CAAC,gBAAgB;iBAC7C;aACF,CAAC,CAAC;YACH,QAAQ,CAAC;gBACP,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE;oBACP,IAAI,EAAE,kBAAkB;oBACxB,KAAK,EAAE,oBAAoB,CAAC,gBAAgB;iBAC7C;aACF,CAAC,CAAC;QACL,CAAC,CACF,CAAC;QAEF,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC;aACvB,qBAAqB,CAAC;YACrB,eAAe,EAAE,OAAO;YACxB,cAAc,EAAE,OAAO;YACvB,IAAI,EAAE,EAAE;SACT,CAAC;aACD,qBAAqB,CAAC;YACrB,eAAe,EAAE,OAAO;YACxB,cAAc,EAAE,OAAO;YACvB,IAAI,EAAE,EAAE;SACT,CAAC,CAAC;QAEL,UAAU,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC,UAAU,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC;QAExE,MAAM,OAAO,CACX,GAAG,EAAE;YACH,MAAM,CAAC,OAAO,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACzC,MAAM,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAClC;gBACE,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,mEAAmE;aAC1E,EACD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;YACF,MAAM,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAClC;gBACE,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,mEAAmE;aAC1E,EACD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;QACJ,CAAC,EACD,EAAE,OAAO,EAAE,IAAI,EAAE,CAClB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kFAAkF,EAAE,KAAK,IAAI,EAAE;QAChG,MAAM,UAAU,GAAG;YACjB;gBACE,IAAI,EAAE,kBAAkB;gBACxB,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,aAAa;gBACnB,QAAQ,EAAE,IAAI;gBACd,eAAe,EAAE;oBACf,IAAI,EAAE,KAAK;oBACX,MAAM,EAAE,oBAAoB;oBAC5B,UAAU,EAAE,KAAK;iBAClB;aACF;YACD;gBACE,IAAI,EAAE,kBAAkB;gBACxB,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,aAAa;gBACnB,QAAQ,EAAE,IAAI;gBACd,eAAe,EAAE;oBACf,IAAI,EAAE,KAAK;oBACX,MAAM,EAAE,oBAAoB;oBAC5B,UAAU,EAAE,KAAK;iBAClB;aACF;SACF,CAAC;QACF,MAAM,OAAO,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QACxB,MAAM,GAAG,GAAG,WAAW,CAAC;QAExB,EAAE,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC,kBAAkB,CACvD,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE;YAC7B,QAAQ,CAAC,EAAE,IAAI,EAAE,mBAAmB,EAAE,CAAC,CAAC;YACxC,QAAQ,CAAC;gBACP,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE;oBACP,IAAI,EAAE,kBAAkB;oBACxB,KAAK,EAAE,oBAAoB,CAAC,gBAAgB;iBAC7C;aACF,CAAC,CAAC;YACH,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;YAC5C,QAAQ,CAAC;gBACP,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE;oBACP,IAAI,EAAE,kBAAkB;oBACxB,KAAK,EAAE,oBAAoB,CAAC,gBAAgB;iBAC7C;aACF,CAAC,CAAC;YACH,QAAQ,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAAC;QACxC,CAAC,CACF,CAAC;QAEF,UAAU,CAAC,GAAG,EAAE,CACd,mBAAmB,CAAC,UAAkC,EAAE,OAAO,EAAE,GAAG,CAAC,CACtE,CAAC;QAEF,MAAM,OAAO,CAAC,GAAG,EAAE;YACjB,MAAM,CAAC,OAAO,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACzC,MAAM,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAClC;gBACE,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,8FAA8F;aACrG,EACD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/src/ui/hooks/useFocus.js

@@ -5,6 +5,7 @@
  */
 import { useStdin, useStdout } from 'ink';
 import { useEffect, useState } from 'react';
+import { useKeypress } from './useKeypress.js';
 // ANSI escape codes to enable/disable terminal focus reporting
 export const ENABLE_FOCUS_REPORTING = '\x1b[?1004h';
 export const DISABLE_FOCUS_REPORTING = '\x1b[?1004l';
@@ -36,6 +37,15 @@ export const useFocus = () => {
             stdin?.removeListener('data', handleData);
         };
     }, [stdin, stdout]);
+    useKeypress((_) => {
+        if (!isFocused) {
+            // If the user has typed a key, and we cannot possibly be focused out.
+            // This is a workaround for some tmux use cases. It is still useful to
+            // listen for the true FOCUS_IN event as well as that will update the
+            // focus state earlier than waiting for a keypress.
+            setIsFocused(true);
+        }
+    }, { isActive: true });
     return isFocused;
 };
 //# sourceMappingURL=useFocus.js.map

package/dist/src/ui/hooks/useFocus.js.map

@@ -1 +1 @@
-{"version":3,"file":"useFocus.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useFocus.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE5C,+DAA+D;AAC/D,MAAM,CAAC,MAAM,sBAAsB,GAAG,aAAa,CAAC;AACpD,MAAM,CAAC,MAAM,uBAAuB,GAAG,aAAa,CAAC;AAErD,qCAAqC;AACrC,MAAM,CAAC,MAAM,QAAQ,GAAG,QAAQ,CAAC;AACjC,MAAM,CAAC,MAAM,SAAS,GAAG,QAAQ,CAAC;AAElC,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,EAAE;IAC3B,MAAM,EAAE,KAAK,EAAE,GAAG,QAAQ,EAAE,CAAC;IAC7B,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,CAAC;IAC/B,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEjD,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,EAAE;YAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjC,MAAM,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YACnD,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;YAErD,IAAI,WAAW,GAAG,YAAY,EAAE,CAAC;gBAC/B,YAAY,CAAC,IAAI,CAAC,CAAC;YACrB,CAAC;iBAAM,IAAI,YAAY,GAAG,WAAW,EAAE,CAAC;gBACtC,YAAY,CAAC,KAAK,CAAC,CAAC;YACtB,CAAC;QACH,CAAC,CAAC;QAEF,yBAAyB;QACzB,MAAM,EAAE,KAAK,CAAC,sBAAsB,CAAC,CAAC;QACtC,KAAK,EAAE,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAE9B,OAAO,GAAG,EAAE;YACV,qCAAqC;YACrC,MAAM,EAAE,KAAK,CAAC,uBAAuB,CAAC,CAAC;YACvC,KAAK,EAAE,cAAc,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAC5C,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;IAEpB,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC"}
+{"version":3,"file":"useFocus.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useFocus.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,+DAA+D;AAC/D,MAAM,CAAC,MAAM,sBAAsB,GAAG,aAAa,CAAC;AACpD,MAAM,CAAC,MAAM,uBAAuB,GAAG,aAAa,CAAC;AAErD,qCAAqC;AACrC,MAAM,CAAC,MAAM,QAAQ,GAAG,QAAQ,CAAC;AACjC,MAAM,CAAC,MAAM,SAAS,GAAG,QAAQ,CAAC;AAElC,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,EAAE;IAC3B,MAAM,EAAE,KAAK,EAAE,GAAG,QAAQ,EAAE,CAAC;IAC7B,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,CAAC;IAC/B,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEjD,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,EAAE;YAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjC,MAAM,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YACnD,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;YAErD,IAAI,WAAW,GAAG,YAAY,EAAE,CAAC;gBAC/B,YAAY,CAAC,IAAI,CAAC,CAAC;YACrB,CAAC;iBAAM,IAAI,YAAY,GAAG,WAAW,EAAE,CAAC;gBACtC,YAAY,CAAC,KAAK,CAAC,CAAC;YACtB,CAAC;QACH,CAAC,CAAC;QAEF,yBAAyB;QACzB,MAAM,EAAE,KAAK,CAAC,sBAAsB,CAAC,CAAC;QACtC,KAAK,EAAE,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAE9B,OAAO,GAAG,EAAE;YACV,qCAAqC;YACrC,MAAM,EAAE,KAAK,CAAC,uBAAuB,CAAC,CAAC;YACvC,KAAK,EAAE,cAAc,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAC5C,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;IAEpB,WAAW,CACT,CAAC,CAAC,EAAE,EAAE;QACJ,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,sEAAsE;YACtE,sEAAsE;YACtE,qEAAqE;YACrE,mDAAmD;YACnD,YAAY,CAAC,IAAI,CAAC,CAAC;QACrB,CAAC;IACH,CAAC,EACD,EAAE,QAAQ,EAAE,IAAI,EAAE,CACnB,CAAC;IAEF,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC"}

package/dist/src/ui/hooks/useFolderTrust.js

@@ -12,16 +12,12 @@ export const useFolderTrust = (settings, onTrustChange) => {
     const [isFolderTrustDialogOpen, setIsFolderTrustDialogOpen] = useState(false);
     const [isRestarting, setIsRestarting] = useState(false);
     const folderTrust = settings.merged.security?.folderTrust?.enabled;
-    const folderTrustFeature = settings.merged.security?.folderTrust?.featureEnabled;
     useEffect(() => {
-        const trusted = isWorkspaceTrusted({
-            folderTrust,
-            folderTrustFeature,
-        });
+        const { isTrusted: trusted } = isWorkspaceTrusted(settings.merged);
         setIsTrusted(trusted);
         setIsFolderTrustDialogOpen(trusted === undefined);
         onTrustChange(trusted);
-    }, [onTrustChange, folderTrust, folderTrustFeature]);
+    }, [folderTrust, onTrustChange, settings.merged]);
     const handleFolderTrustSelect = useCallback((choice) => {
         const trustedFolders = loadTrustedFolders();
         const cwd = process.cwd();
@@ -41,11 +37,11 @@ export const useFolderTrust = (settings, onTrustChange) => {
                 return;
         }
         trustedFolders.setValue(cwd, trustLevel);
-        const newIsTrusted = trustLevel === TrustLevel.TRUST_FOLDER ||
+        const currentIsTrusted = trustLevel === TrustLevel.TRUST_FOLDER ||
             trustLevel === TrustLevel.TRUST_PARENT;
-        setIsTrusted(newIsTrusted);
-        onTrustChange(newIsTrusted);
-        const needsRestart = wasTrusted !== newIsTrusted;
+        setIsTrusted(currentIsTrusted);
+        onTrustChange(currentIsTrusted);
+        const needsRestart = wasTrusted !== currentIsTrusted;
         if (needsRestart) {
             setIsRestarting(true);
             setIsFolderTrustDialogOpen(true);

package/dist/src/ui/hooks/useFolderTrust.js.map

@@ -1 +1 @@
-{"version":3,"file":"useFolderTrust.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useFolderTrust.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EACL,kBAAkB,EAClB,UAAU,EACV,kBAAkB,GACnB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AAExC,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,QAAwB,EACxB,aAAuD,EACvD,EAAE;IACF,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAsB,SAAS,CAAC,CAAC;IAC3E,MAAM,CAAC,uBAAuB,EAAE,0BAA0B,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9E,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExD,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,EAAE,OAAO,CAAC;IACnE,MAAM,kBAAkB,GACtB,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,EAAE,cAAc,CAAC;IAExD,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,OAAO,GAAG,kBAAkB,CAAC;YACjC,WAAW;YACX,kBAAkB;SACP,CAAC,CAAC;QACf,YAAY,CAAC,OAAO,CAAC,CAAC;QACtB,0BAA0B,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC;QAClD,aAAa,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC,EAAE,CAAC,aAAa,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAAC,CAAC;IAErD,MAAM,uBAAuB,GAAG,WAAW,CACzC,CAAC,MAAyB,EAAE,EAAE;QAC5B,MAAM,cAAc,GAAG,kBAAkB,EAAE,CAAC;QAC5C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAC1B,IAAI,UAAsB,CAAC;QAE3B,MAAM,UAAU,GAAG,SAAS,IAAI,IAAI,CAAC;QAErC,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,iBAAiB,CAAC,YAAY;gBACjC,UAAU,GAAG,UAAU,CAAC,YAAY,CAAC;gBACrC,MAAM;YACR,KAAK,iBAAiB,CAAC,YAAY;gBACjC,UAAU,GAAG,UAAU,CAAC,YAAY,CAAC;gBACrC,MAAM;YACR,KAAK,iBAAiB,CAAC,YAAY;gBACjC,UAAU,GAAG,UAAU,CAAC,YAAY,CAAC;gBACrC,MAAM;YACR;gBACE,OAAO;QACX,CAAC;QAED,cAAc,CAAC,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QACzC,MAAM,YAAY,GAChB,UAAU,KAAK,UAAU,CAAC,YAAY;YACtC,UAAU,KAAK,UAAU,CAAC,YAAY,CAAC;QACzC,YAAY,CAAC,YAAY,CAAC,CAAC;QAC3B,aAAa,CAAC,YAAY,CAAC,CAAC;QAE5B,MAAM,YAAY,GAAG,UAAU,KAAK,YAAY,CAAC;QACjD,IAAI,YAAY,EAAE,CAAC;YACjB,eAAe,CAAC,IAAI,CAAC,CAAC;YACtB,0BAA0B,CAAC,IAAI,CAAC,CAAC;QACnC,CAAC;aAAM,CAAC;YACN,0BAA0B,CAAC,KAAK,CAAC,CAAC;QACpC,CAAC;IACH,CAAC,EACD,CAAC,aAAa,EAAE,SAAS,CAAC,CAC3B,CAAC;IAEF,OAAO;QACL,SAAS;QACT,uBAAuB;QACvB,uBAAuB;QACvB,YAAY;KACb,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"useFolderTrust.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useFolderTrust.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EACL,kBAAkB,EAClB,UAAU,EACV,kBAAkB,GACnB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AAExC,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,QAAwB,EACxB,aAAuD,EACvD,EAAE;IACF,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAsB,SAAS,CAAC,CAAC;IAC3E,MAAM,CAAC,uBAAuB,EAAE,0BAA0B,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9E,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExD,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,EAAE,OAAO,CAAC;IAEnE,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,kBAAkB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACnE,YAAY,CAAC,OAAO,CAAC,CAAC;QACtB,0BAA0B,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC;QAClD,aAAa,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC,EAAE,CAAC,WAAW,EAAE,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAElD,MAAM,uBAAuB,GAAG,WAAW,CACzC,CAAC,MAAyB,EAAE,EAAE;QAC5B,MAAM,cAAc,GAAG,kBAAkB,EAAE,CAAC;QAC5C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAC1B,IAAI,UAAsB,CAAC;QAE3B,MAAM,UAAU,GAAG,SAAS,IAAI,IAAI,CAAC;QAErC,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,iBAAiB,CAAC,YAAY;gBACjC,UAAU,GAAG,UAAU,CAAC,YAAY,CAAC;gBACrC,MAAM;YACR,KAAK,iBAAiB,CAAC,YAAY;gBACjC,UAAU,GAAG,UAAU,CAAC,YAAY,CAAC;gBACrC,MAAM;YACR,KAAK,iBAAiB,CAAC,YAAY;gBACjC,UAAU,GAAG,UAAU,CAAC,YAAY,CAAC;gBACrC,MAAM;YACR;gBACE,OAAO;QACX,CAAC;QAED,cAAc,CAAC,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QACzC,MAAM,gBAAgB,GACpB,UAAU,KAAK,UAAU,CAAC,YAAY;YACtC,UAAU,KAAK,UAAU,CAAC,YAAY,CAAC;QACzC,YAAY,CAAC,gBAAgB,CAAC,CAAC;QAC/B,aAAa,CAAC,gBAAgB,CAAC,CAAC;QAEhC,MAAM,YAAY,GAAG,UAAU,KAAK,gBAAgB,CAAC;QACrD,IAAI,YAAY,EAAE,CAAC;YACjB,eAAe,CAAC,IAAI,CAAC,CAAC;YACtB,0BAA0B,CAAC,IAAI,CAAC,CAAC;QACnC,CAAC;aAAM,CAAC;YACN,0BAA0B,CAAC,KAAK,CAAC,CAAC;QACpC,CAAC;IACH,CAAC,EACD,CAAC,aAAa,EAAE,SAAS,CAAC,CAC3B,CAAC;IAEF,OAAO;QACL,SAAS;QACT,uBAAuB;QACvB,uBAAuB;QACvB,YAAY;KACb,CAAC;AACJ,CAAC,CAAC"}

package/dist/src/ui/hooks/useGeminiStream.d.ts

@@ -3,20 +3,23 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import type { Config, GeminiClient, EditorType, ThoughtSummary } from '@umsai/ums-code-core';
+import type { Config, EditorType, GeminiClient, ThoughtSummary } from '@umsai/ums-code-core';
+import { ApprovalMode } from '@umsai/ums-code-core';
 import { type PartListUnion } from '@google/genai';
 import type { HistoryItem, HistoryItemWithoutId, SlashCommandProcessorResult } from '../types.js';
 import { StreamingState } from '../types.js';
 import type { UseHistoryManagerReturn } from './useHistoryManager.js';
+import { type TrackedToolCall } from './useReactToolScheduler.js';
+import type { LoadedSettings } from '../../config/settings.js';
 /**
  * Manages the Gemini stream, including user input, command processing,
  * API interaction, and tool call lifecycle.
  */
-export declare const useGeminiStream: (geminiClient: GeminiClient, history: HistoryItem[], addItem: UseHistoryManagerReturn["addItem"], config: Config, onDebugMessage: (message: string) => void, handleSlashCommand: (cmd: PartListUnion) => Promise<SlashCommandProcessorResult | false>, shellModeActive: boolean, getPreferredEditor: () => EditorType | undefined, onAuthError: () => void, performMemoryRefresh: () => Promise<void>, modelSwitchedFromQuotaError: boolean, setModelSwitchedFromQuotaError: React.Dispatch<React.SetStateAction<boolean>>, onEditorClose: () => void, onCancelSubmit: () => void, visionModelPreviewEnabled: boolean, onVisionSwitchRequired?: (query: PartListUnion) => Promise<{
+export declare const useGeminiStream: (geminiClient: GeminiClient, history: HistoryItem[], addItem: UseHistoryManagerReturn["addItem"], config: Config, settings: LoadedSettings, onDebugMessage: (message: string) => void, handleSlashCommand: (cmd: PartListUnion) => Promise<SlashCommandProcessorResult | false>, shellModeActive: boolean, getPreferredEditor: () => EditorType | undefined, onAuthError: (error: string) => void, performMemoryRefresh: () => Promise<void>, modelSwitchedFromQuotaError: boolean, setModelSwitchedFromQuotaError: React.Dispatch<React.SetStateAction<boolean>>, onEditorClose: () => void, onCancelSubmit: () => void, visionModelPreviewEnabled: boolean, setShellInputFocused: (value: boolean) => void, terminalWidth: number, terminalHeight: number, onVisionSwitchRequired?: (query: PartListUnion) => Promise<{
     modelOverride?: string;
     persistSessionModel?: string;
     showGuidance?: boolean;
-}>) => {
+}>, isShellFocused?: boolean) => {
     streamingState: StreamingState;
     submitQuery: (query: PartListUnion, options?: {
         isContinuation: boolean;
@@ -25,4 +28,12 @@ export declare const useGeminiStream: (geminiClient: GeminiClient, history: Hist
     pendingHistoryItems: HistoryItemWithoutId[];
     thought: ThoughtSummary | null;
     cancelOngoingRequest: () => void;
+    pendingToolCalls: TrackedToolCall[];
+    handleApprovalModeChange: (newApprovalMode: ApprovalMode) => Promise<void>;
+    activePtyId: number | undefined;
+    loopDetectionConfirmationRequest: {
+        onComplete: (result: {
+            userSelection: "disable" | "keep";
+        }) => void;
+    } | null;
 };

package/dist/src/ui/hooks/useGeminiStream.js

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { useState, useRef, useCallback, useEffect, useMemo } from 'react';
-import { GeminiEventType as ServerGeminiEventType, getErrorMessage, isNodeError, MessageSenderType, logUserPrompt, GitService, UnauthorizedError, UserPromptEvent, DEFAULT_GEMINI_FLASH_MODEL, logConversationFinishedEvent, ConversationFinishedEvent, ApprovalMode, parseAndFormatApiError, trackUserQueryEvent, trackTaskStatusEvent, trackToolCallStatusEvent, } from '@umsai/ums-code-core';
+import { GeminiEventType as ServerGeminiEventType, getErrorMessage, isNodeError, MessageSenderType, logUserPrompt, GitService, UnauthorizedError, UserPromptEvent, DEFAULT_GEMINI_FLASH_MODEL, logConversationFinishedEvent, ConversationFinishedEvent, ApprovalMode, parseAndFormatApiError, promptIdContext, ToolConfirmationOutcome, logApiCancel, ApiCancelEvent, trackUserQueryEvent, trackTaskStatusEvent, trackToolCallStatusEvent, } from '@umsai/ums-code-core';
 import { FinishReason } from '@google/genai';
 import { StreamingState, MessageType, ToolCallStatus } from '../types.js';
 import { isAtCommand, isSlashCommand } from '../utils/commandUtils.js';
@@ -14,9 +14,9 @@ import { handleAtCommand } from './atCommandProcessor.js';
 import { findLastSafeSplitPoint } from '../utils/markdownUtilities.js';
 import { useStateAndRef } from './useStateAndRef.js';
 import { useLogger } from './useLogger.js';
+import { useReactToolScheduler, mapToDisplay as mapTrackedToolCallsToDisplay, } from './useReactToolScheduler.js';
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
-import { useReactToolScheduler, mapToDisplay as mapTrackedToolCallsToDisplay, } from './useReactToolScheduler.js';
 import { useSessionStats } from '../contexts/SessionContext.js';
 import { useKeypress } from './useKeypress.js';
 var StreamProcessingStatus;
@@ -25,18 +25,26 @@ var StreamProcessingStatus;
     StreamProcessingStatus[StreamProcessingStatus["UserCancelled"] = 1] = "UserCancelled";
     StreamProcessingStatus[StreamProcessingStatus["Error"] = 2] = "Error";
 })(StreamProcessingStatus || (StreamProcessingStatus = {}));
+const EDIT_TOOL_NAMES = new Set(['replace', 'write_file']);
+function showCitations(settings) {
+    const enabled = settings?.merged?.ui?.showCitations;
+    if (enabled !== undefined) {
+        return enabled;
+    }
+    return true;
+}
 /**
  * Manages the Gemini stream, including user input, command processing,
  * API interaction, and tool call lifecycle.
  */
-export const useGeminiStream = (geminiClient, history, addItem, config, onDebugMessage, handleSlashCommand, shellModeActive, getPreferredEditor, onAuthError, performMemoryRefresh, modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError, onEditorClose, onCancelSubmit, visionModelPreviewEnabled, onVisionSwitchRequired) => {
+export const useGeminiStream = (geminiClient, history, addItem, config, settings, onDebugMessage, handleSlashCommand, shellModeActive, getPreferredEditor, onAuthError, performMemoryRefresh, modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError, onEditorClose, onCancelSubmit, visionModelPreviewEnabled, setShellInputFocused, terminalWidth, terminalHeight, onVisionSwitchRequired, isShellFocused) => {
     const [initError, setInitError] = useState(null);
     const abortControllerRef = useRef(null);
     const turnCancelledRef = useRef(false);
     const isSubmittingQueryRef = useRef(false);
     const [isResponding, setIsResponding] = useState(false);
     const [thought, setThought] = useState(null);
-    const [pendingHistoryItemRef, setPendingHistoryItem] = useStateAndRef(null);
+    const [pendingHistoryItem, pendingHistoryItemRef, setPendingHistoryItem] = useStateAndRef(null);
     const processedMemoryToolsRef = useRef(new Set());
     const { startNewPrompt, getPromptCount } = useSessionStats();
     const storage = config.storage;
@@ -55,16 +63,30 @@ export const useGeminiStream = (geminiClient, history, addItem, config, onDebugM
             // Handle tool response submission immediately when tools complete
             await handleCompletedTools(completedToolCallsFromScheduler);
         }
-    }, config, setPendingHistoryItem, getPreferredEditor, onEditorClose);
+    }, config, getPreferredEditor, onEditorClose);
     const pendingToolCallGroupDisplay = useMemo(() => toolCalls.length ? mapTrackedToolCallsToDisplay(toolCalls) : undefined, [toolCalls]);
+    const activeToolPtyId = useMemo(() => {
+        const executingShellTool = toolCalls?.find((tc) => tc.status === 'executing' && tc.request.name === 'run_shell_command');
+        if (executingShellTool) {
+            return executingShellTool.pid;
+        }
+        return undefined;
+    }, [toolCalls]);
     const loopDetectedRef = useRef(false);
+    const [loopDetectionConfirmationRequest, setLoopDetectionConfirmationRequest,] = useState(null);
     const onExec = useCallback(async (done) => {
         setIsResponding(true);
         await done;
         setIsResponding(false);
     }, []);
-    const { handleShellCommand } = useShellCommandProcessor(addItem, setPendingHistoryItem, onExec, onDebugMessage, config, geminiClient);
+    const { handleShellCommand, activeShellPtyId } = useShellCommandProcessor(addItem, setPendingHistoryItem, onExec, onDebugMessage, config, geminiClient, setShellInputFocused, terminalWidth, terminalHeight);
     const { handleVisionSwitch, restoreOriginalModel } = useVisionAutoSwitch(config, addItem, visionModelPreviewEnabled, onVisionSwitchRequired);
+    const activePtyId = activeShellPtyId || activeToolPtyId;
+    useEffect(() => {
+        if (!activePtyId) {
+            setShellInputFocused(false);
+        }
+    }, [activePtyId, setShellInputFocused]);
     // 工具调用状态
     const streamingState = useMemo(() => {
         if (toolCalls.some((tc) => tc.status === 'awaiting_approval')) {
@@ -103,6 +125,10 @@ export const useGeminiStream = (geminiClient, history, addItem, config, onDebugM
         turnCancelledRef.current = true;
         isSubmittingQueryRef.current = false;
         abortControllerRef.current?.abort();
+        // Log API cancellation
+        const prompt_id = config.getSessionId() + '########' + getPromptCount();
+        const cancellationEvent = new ApiCancelEvent(config.getModel(), prompt_id, config.getContentGeneratorConfig()?.authType);
+        logApiCancel(config, cancellationEvent);
         if (pendingHistoryItemRef.current) {
             addItem(pendingHistoryItemRef.current, Date.now());
         }
@@ -113,15 +139,19 @@ export const useGeminiStream = (geminiClient, history, addItem, config, onDebugM
         setPendingHistoryItem(null);
         onCancelSubmit();
         setIsResponding(false);
+        setShellInputFocused(false);
     }, [
         streamingState,
         addItem,
         setPendingHistoryItem,
         onCancelSubmit,
         pendingHistoryItemRef,
+        setShellInputFocused,
+        config,
+        getPromptCount,
     ]);
     useKeypress((key) => {
-        if (key.name === 'escape') {
+        if (key.name === 'escape' && !isShellFocused) {
             cancelOngoingRequest();
         }
     }, { isActive: streamingState === StreamingState.Responding });
@@ -135,7 +165,6 @@ export const useGeminiStream = (geminiClient, history, addItem, config, onDebugM
         let localQueryToSendToGemini = null;
         if (typeof query === 'string') {
             const trimmedQuery = query.trim();
-            logUserPrompt(config, new UserPromptEvent(trimmedQuery.length, prompt_id, config.getContentGeneratorConfig()?.authType, trimmedQuery));
             onDebugMessage(`User query: '${trimmedQuery}'`);
             await logger?.logMessage(MessageSenderType.USER, trimmedQuery);
             // Handle UI-only commands first
@@ -300,8 +329,21 @@ export const useGeminiStream = (geminiClient, history, addItem, config, onDebugM
         }, userMessageTimestamp);
         setThought(null); // Reset thought when there's an error
     }, [addItem, pendingHistoryItemRef, setPendingHistoryItem, config, setThought]);
+    const handleCitationEvent = useCallback((text, userMessageTimestamp) => {
+        if (!showCitations(settings)) {
+            return;
+        }
+        if (pendingHistoryItemRef.current) {
+            addItem(pendingHistoryItemRef.current, userMessageTimestamp);
+            setPendingHistoryItem(null);
+        }
+        addItem({ type: MessageType.INFO, text }, userMessageTimestamp);
+    }, [addItem, pendingHistoryItemRef, setPendingHistoryItem, settings]);
     const handleFinishedEvent = useCallback((event, userMessageTimestamp) => {
-        const finishReason = event.value;
+        const finishReason = event.value.reason;
+        if (!finishReason) {
+            return;
+        }
         const finishReasonMessages = {
             [FinishReason.FINISH_REASON_UNSPECIFIED]: undefined,
             [FinishReason.STOP]: undefined,
@@ -325,13 +367,19 @@ export const useGeminiStream = (geminiClient, history, addItem, config, onDebugM
             }, userMessageTimestamp);
         }
     }, [addItem]);
-    const handleChatCompressionEvent = useCallback((eventValue) => addItem({
-        type: 'info',
-        text: `IMPORTANT: This conversation approached the input token limit for ${config.getModel()}. ` +
-            `A compressed context will be sent for future messages (compressed from: ` +
-            `${eventValue?.originalTokenCount ?? 'unknown'} to ` +
-            `${eventValue?.newTokenCount ?? 'unknown'} tokens).`,
-    }, Date.now()), [addItem, config]);
+    const handleChatCompressionEvent = useCallback((eventValue, userMessageTimestamp) => {
+        if (pendingHistoryItemRef.current) {
+            addItem(pendingHistoryItemRef.current, userMessageTimestamp);
+            setPendingHistoryItem(null);
+        }
+        return addItem({
+            type: 'info',
+            text: `IMPORTANT: This conversation approached the input token limit for ${config.getModel()}. ` +
+                `A compressed context will be sent for future messages (compressed from: ` +
+                `${eventValue?.originalTokenCount ?? 'unknown'} to ` +
+                `${eventValue?.newTokenCount ?? 'unknown'} tokens).`,
+        }, Date.now());
+    }, [addItem, config, pendingHistoryItemRef, setPendingHistoryItem]);
     const handleMaxSessionTurnsEvent = useCallback(() => addItem({
         type: 'info',
         text: `The session has reached the maximum number of turns: ${config.getMaxSessionTurns()}. ` +
@@ -345,12 +393,28 @@ export const useGeminiStream = (geminiClient, history, addItem, config, onDebugM
             `   • Increase limit: Add "sessionTokenLimit": (e.g., 128000) to your settings.json\n` +
             `   • Compress history: Use /compress command to compress history`,
     }, Date.now()), [addItem]);
+    const handleLoopDetectionConfirmation = useCallback((result) => {
+        setLoopDetectionConfirmationRequest(null);
+        if (result.userSelection === 'disable') {
+            config.getGeminiClient().getLoopDetectionService().disableForSession();
+            addItem({
+                type: 'info',
+                text: `Loop detection has been disabled for this session. Please try your request again.`,
+            }, Date.now());
+        }
+        else {
+            addItem({
+                type: 'info',
+                text: `A potential loop was detected. This can happen due to repetitive tool calls or other model behavior. The request has been halted.`,
+            }, Date.now());
+        }
+    }, [config, addItem]);
     const handleLoopDetectedEvent = useCallback(() => {
-        addItem({
-            type: 'info',
-            text: `A potential loop was detected. This can happen due to repetitive tool calls or other model behavior. The request has been halted.`,
-        }, Date.now());
-    }, [addItem]);
+        // Show the confirmation dialog to choose whether to disable loop detection
+        setLoopDetectionConfirmationRequest({
+            onComplete: handleLoopDetectionConfirmation,
+        });
+    }, [handleLoopDetectionConfirmation]);
     const processGeminiStreamEvents = useCallback(async (stream, userMessageTimestamp, signal, model, sessionId) => {
         let geminiMessageBuffer = '';
         const toolCallRequests = [];
@@ -381,7 +445,7 @@ export const useGeminiStream = (geminiClient, history, addItem, config, onDebugM
                 case ServerGeminiEventType.ChatCompressed:
                     // 上下文压缩事件
                     trackTaskStatusEvent(model, sessionId, event.type);
-                    handleChatCompressionEvent(event.value);
+                    handleChatCompressionEvent(event.value, userMessageTimestamp);
                     break;
                 case ServerGeminiEventType.ToolCallConfirmation:
                 case ServerGeminiEventType.ToolCallResponse:
@@ -401,11 +465,14 @@ export const useGeminiStream = (geminiClient, history, addItem, config, onDebugM
                     break;
                 case ServerGeminiEventType.Finished:
                     // 结束事件
-                    if (event.value === FinishReason.STOP || event.value === FinishReason.MAX_TOKENS) {
+                    if (event.value.reason === FinishReason.STOP || event.value.reason === FinishReason.MAX_TOKENS) {
                         trackTaskStatusEvent(model, sessionId, event.type);
                     }
                     handleFinishedEvent(event, userMessageTimestamp);
                     break;
+                case ServerGeminiEventType.Citation:
+                    handleCitationEvent(event.value, userMessageTimestamp);
+                    break;
                 case ServerGeminiEventType.LoopDetected:
                     // handle later because we want to move pending history to history
                     // before we add loop detected message to history
@@ -439,6 +506,7 @@ export const useGeminiStream = (geminiClient, history, addItem, config, onDebugM
         handleFinishedEvent,
         handleMaxSessionTurnsEvent,
         handleSessionTokenLimitExceededEvent,
+        handleCitationEvent,
     ]);
     const submitQuery = useCallback(async (query, options, prompt_id) => {
         // Prevent concurrent executions of submitQuery, but allow continuations
@@ -464,70 +532,78 @@ export const useGeminiStream = (geminiClient, history, addItem, config, onDebugM
         if (!prompt_id) {
             prompt_id = config.getSessionId() + '########' + getPromptCount();
         }
-        const { queryToSend, shouldProceed } = await prepareQueryForGemini(query, userMessageTimestamp, abortSignal, prompt_id);
-        if (!shouldProceed || queryToSend === null) {
-            isSubmittingQueryRef.current = false;
-            return;
-        }
-        // Handle vision switch requirement
-        const visionSwitchResult = await handleVisionSwitch(queryToSend, userMessageTimestamp, options?.isContinuation || false);
-        if (!visionSwitchResult.shouldProceed) {
-            isSubmittingQueryRef.current = false;
-            return;
-        }
-        const finalQueryToSend = queryToSend;
-        if (!options?.isContinuation) {
-            startNewPrompt();
-            setThought(null); // Reset thought when starting a new prompt
-        }
-        setIsResponding(true);
-        setInitError(null);
-        // 发送用户输入事件埋点
-        trackUserQueryEvent(config.getSessionId());
-        try {
-            const stream = geminiClient.sendMessageStream(finalQueryToSend, abortSignal, prompt_id);
-            const processingStatus = await processGeminiStreamEvents(stream, userMessageTimestamp, abortSignal, config.getModel(), config.getSessionId());
-            // TODO 用户取消事件
-            if (processingStatus === StreamProcessingStatus.UserCancelled) {
-                // Restore original model if it was temporarily overridden
-                restoreOriginalModel().catch((error) => {
-                    console.error('Failed to restore original model:', error);
-                });
+        return promptIdContext.run(prompt_id, async () => {
+            const { queryToSend, shouldProceed } = await prepareQueryForGemini(query, userMessageTimestamp, abortSignal, prompt_id);
+            if (!shouldProceed || queryToSend === null) {
                 isSubmittingQueryRef.current = false;
                 return;
             }
-            if (pendingHistoryItemRef.current) {
-                addItem(pendingHistoryItemRef.current, userMessageTimestamp);
-                setPendingHistoryItem(null);
+            // Handle vision switch requirement
+            // 是否切换视觉模型处理
+            const visionSwitchResult = await handleVisionSwitch(queryToSend, userMessageTimestamp, options?.isContinuation || false);
+            if (!visionSwitchResult.shouldProceed) {
+                isSubmittingQueryRef.current = false;
+                return;
             }
-            if (loopDetectedRef.current) {
-                loopDetectedRef.current = false;
-                handleLoopDetectedEvent();
+            const finalQueryToSend = queryToSend;
+            if (!options?.isContinuation) {
+                if (typeof queryToSend === 'string') {
+                    // logging the text prompts only for now
+                    const promptText = queryToSend;
+                    logUserPrompt(config, new UserPromptEvent(promptText.length, prompt_id, config.getContentGeneratorConfig()?.authType, promptText));
+                }
+                startNewPrompt();
+                setThought(null); // Reset thought when starting a new prompt
             }
-            // Restore original model if it was temporarily overridden
-            restoreOriginalModel().catch((error) => {
-                console.error('Failed to restore original model:', error);
-            });
-        }
-        catch (error) {
-            // Restore original model if it was temporarily overridden
-            restoreOriginalModel().catch((error) => {
-                console.error('Failed to restore original model:', error);
-            });
-            if (error instanceof UnauthorizedError) {
-                onAuthError();
+            setIsResponding(true);
+            setInitError(null);
+            // 发送用户输入事件埋点
+            trackUserQueryEvent(config.getSessionId());
+            try {
+                const stream = geminiClient.sendMessageStream(finalQueryToSend, abortSignal, prompt_id);
+                const processingStatus = await processGeminiStreamEvents(stream, userMessageTimestamp, abortSignal, config.getModel(), config.getSessionId());
+                // 用户取消事件
+                if (processingStatus === StreamProcessingStatus.UserCancelled) {
+                    // Restore original model if it was temporarily overridden
+                    restoreOriginalModel().catch((error) => {
+                        console.error('Failed to restore original model:', error);
+                    });
+                    isSubmittingQueryRef.current = false;
+                    return;
+                }
+                if (pendingHistoryItemRef.current) {
+                    addItem(pendingHistoryItemRef.current, userMessageTimestamp);
+                    setPendingHistoryItem(null);
+                }
+                if (loopDetectedRef.current) {
+                    loopDetectedRef.current = false;
+                    handleLoopDetectedEvent();
+                }
+                // Restore original model if it was temporarily overridden
+                restoreOriginalModel().catch((error) => {
+                    console.error('Failed to restore original model:', error);
+                });
             }
-            else if (!isNodeError(error) || error.name !== 'AbortError') {
-                addItem({
-                    type: MessageType.ERROR,
-                    text: parseAndFormatApiError(getErrorMessage(error) || 'Unknown error', config.getContentGeneratorConfig()?.authType, undefined, config.getModel(), DEFAULT_GEMINI_FLASH_MODEL),
-                }, userMessageTimestamp);
+            catch (error) {
+                // Restore original model if it was temporarily overridden
+                restoreOriginalModel().catch((error) => {
+                    console.error('Failed to restore original model:', error);
+                });
+                if (error instanceof UnauthorizedError) {
+                    onAuthError('Session expired or is unauthorized.');
+                }
+                else if (!isNodeError(error) || error.name !== 'AbortError') {
+                    addItem({
+                        type: MessageType.ERROR,
+                        text: parseAndFormatApiError(getErrorMessage(error) || 'Unknown error', config.getContentGeneratorConfig()?.authType, undefined, config.getModel(), DEFAULT_GEMINI_FLASH_MODEL),
+                    }, userMessageTimestamp);
+                }
             }
-        }
-        finally {
-            setIsResponding(false);
-            isSubmittingQueryRef.current = false;
-        }
+            finally {
+                setIsResponding(false);
+                isSubmittingQueryRef.current = false;
+            }
+        });
     }, [
         streamingState,
         setModelSwitchedFromQuotaError,
@@ -546,6 +622,28 @@ export const useGeminiStream = (geminiClient, history, addItem, config, onDebugM
         handleVisionSwitch,
         restoreOriginalModel,
     ]);
+    const handleApprovalModeChange = useCallback(async (newApprovalMode) => {
+        // Auto-approve pending tool calls when switching to auto-approval modes
+        if (newApprovalMode === ApprovalMode.YOLO ||
+            newApprovalMode === ApprovalMode.AUTO_EDIT) {
+            let awaitingApprovalCalls = toolCalls.filter((call) => call.status === 'awaiting_approval');
+            // For AUTO_EDIT mode, only approve edit tools (replace, write_file)
+            if (newApprovalMode === ApprovalMode.AUTO_EDIT) {
+                awaitingApprovalCalls = awaitingApprovalCalls.filter((call) => EDIT_TOOL_NAMES.has(call.request.name));
+            }
+            // Process pending tool calls sequentially to reduce UI chaos
+            for (const call of awaitingApprovalCalls) {
+                if (call.confirmationDetails?.onConfirm) {
+                    try {
+                        await call.confirmationDetails.onConfirm(ToolConfirmationOutcome.ProceedOnce);
+                    }
+                    catch (error) {
+                        console.error(`Failed to auto-approve tool call ${call.request.callId}:`, error);
+                    }
+                }
+            }
+        }
+    }, [toolCalls]);
     const handleCompletedTools = useCallback(async (completedToolCallsFromScheduler) => {
         if (isResponding) {
             return;
@@ -626,14 +724,13 @@ export const useGeminiStream = (geminiClient, history, addItem, config, onDebugM
         performMemoryRefresh,
         modelSwitchedFromQuotaError,
     ]);
-    const pendingHistoryItems = useMemo(() => [pendingHistoryItemRef.current, pendingToolCallGroupDisplay].filter((i) => i !== undefined && i !== null), [pendingHistoryItemRef, pendingToolCallGroupDisplay]);
+    const pendingHistoryItems = useMemo(() => [pendingHistoryItem, pendingToolCallGroupDisplay].filter((i) => i !== undefined && i !== null), [pendingHistoryItem, pendingToolCallGroupDisplay]);
     useEffect(() => {
         const saveRestorableToolCalls = async () => {
             if (!config.getCheckpointingEnabled()) {
                 return;
             }
-            const restorableToolCalls = toolCalls.filter((toolCall) => (toolCall.request.name === 'edit' ||
-                toolCall.request.name === 'write_file') &&
+            const restorableToolCalls = toolCalls.filter((toolCall) => EDIT_TOOL_NAMES.has(toolCall.request.name) &&
                 toolCall.status === 'awaiting_approval');
             if (restorableToolCalls.length > 0) {
                 const checkpointDir = storage.getProjectTempCheckpointsDir();
@@ -717,6 +814,10 @@ export const useGeminiStream = (geminiClient, history, addItem, config, onDebugM
         pendingHistoryItems,
         thought,
         cancelOngoingRequest,
+        pendingToolCalls: toolCalls,
+        handleApprovalModeChange,
+        activePtyId,
+        loopDetectionConfirmationRequest,
     };
 };
 //# sourceMappingURL=useGeminiStream.js.map